Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

19 files changed, 674 insertions, 580 deletions

diff --git a/mail/Makefile b/mail/Makefile
index eb33b7259161..4f407d8d5642 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -120,6 +120,7 @@
     SUBDIR += esmtp
     SUBDIR += evolution
     SUBDIR += evolution-exchange
+    SUBDIR += evolution-mapi
     SUBDIR += evolution-sharp
     SUBDIR += exact
     SUBDIR += exilog
@@ -213,6 +214,7 @@
     SUBDIR += libdomainkeys
     SUBDIR += libesmtp
     SUBDIR += libetpan
+    SUBDIR += libmapi
     SUBDIR += libnewmail
     SUBDIR += libpst
     SUBDIR += librfc822
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 4e9cbcf09cb5..2d2672df76ac 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.3 2009/04/16 01:14:40 kwm Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.146 2009/10/18 05:41:36 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,8 +32,8 @@ CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--disable-compile-warnings \
 		--with-libdb=${LOCALBASE}
 
-EVO_VERSION=	2.26
-VERSION=	2.26
+EVO_VERSION=	2.28
+VERSION=	2.28
 PLIST_SUB=	VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
 		EDS_VERSION="1.2"
 
@@ -52,6 +51,7 @@ IGNORE=	build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_i
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
+		-e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 6cba0d97afdb..55fbcfeb1db4 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.26.3.tar.bz2) = 6ee035bfcafeef0aba01b459092eeec7
-SHA256 (gnome2/evolution-exchange-2.26.3.tar.bz2) = 525f41539fc060bbe53f92fe2902eb7877a62803548bb96118c5a64ec4cebd8d
-SIZE (gnome2/evolution-exchange-2.26.3.tar.bz2) = 962297
+MD5 (gnome2/evolution-exchange-2.28.1.tar.bz2) = fa8892c4859018b464a33acaf3383e91
+SHA256 (gnome2/evolution-exchange-2.28.1.tar.bz2) = 247a176723789a9ce9bd36cafa29b7d470abcb5aa8f9426f350c7f93adb98984
+SIZE (gnome2/evolution-exchange-2.28.1.tar.bz2) = 965508
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 141c0232c604..2242adac753e 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -81,6 +81,7 @@ share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -109,6 +110,7 @@ share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mai/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -166,10 +168,14 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/as/LC_MESSAGES
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
new file mode 100644
index 000000000000..1b8346e01cb6
--- /dev/null
+++ b/mail/evolution-mapi/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:	evolution-mapi
+# Date created:				24 Mar, 2009
+# Whom:					Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/mail/evolution-mapi/Makefile,v 1.5 2009/10/19 18:17:14 kwm Exp $
+#
+
+PORTNAME=	evolution-mapi
+PORTVERSION=	0.28.1
+CATEGORIES=	mail gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
+
+BUILD_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+LIB_DEPENDS=	mapi.0:${PORTSDIR}/mail/libmapi
+RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+
+PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	evolutiondataserver
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+EVO_VERSION=	2.28
+EDS_VERSION=	1.2
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/src/libexchangemapi/Makefile.in
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+	    	${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
new file mode 100644
index 000000000000..d4f34a1644a8
--- /dev/null
+++ b/mail/evolution-mapi/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/evolution-mapi-0.28.1.tar.bz2) = 9a165a3e12f9f8a77e54914837ef5359
+SHA256 (gnome2/evolution-mapi-0.28.1.tar.bz2) = 72829d7616d31014d31f5f0ccdea74c55b8d0626da6d549f6730004aa83cbf68
+SIZE (gnome2/evolution-mapi-0.28.1.tar.bz2) = 505155
diff --git a/mail/evolution-mapi/pkg-descr b/mail/evolution-mapi/pkg-descr
new file mode 100644
index 000000000000..21610bb5434c
--- /dev/null
+++ b/mail/evolution-mapi/pkg-descr
@@ -0,0 +1 @@
+WWW:	http://www.go-evolution.org/MAPIProvider
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
new file mode 100644
index 000000000000..26dcf1428520
--- /dev/null
+++ b/mail/evolution-mapi/pkg-plist
@@ -0,0 +1,101 @@
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-defs.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-folder.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.urls
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.la
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-exchange-mapi.eplug
+lib/libexchangemapi-1.0.la
+lib/libexchangemapi-1.0.so
+lib/libexchangemapi-1.0.so.0
+share/locale/as/LC_MESSAGES/evolution-mapi.mo
+share/locale/bg/LC_MESSAGES/evolution-mapi.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-mapi.mo
+share/locale/cs/LC_MESSAGES/evolution-mapi.mo
+share/locale/da/LC_MESSAGES/evolution-mapi.mo
+share/locale/de/LC_MESSAGES/evolution-mapi.mo
+share/locale/el/LC_MESSAGES/evolution-mapi.mo
+share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/es/LC_MESSAGES/evolution-mapi.mo
+share/locale/et/LC_MESSAGES/evolution-mapi.mo
+share/locale/eu/LC_MESSAGES/evolution-mapi.mo
+share/locale/fi/LC_MESSAGES/evolution-mapi.mo
+share/locale/fr/LC_MESSAGES/evolution-mapi.mo
+share/locale/gl/LC_MESSAGES/evolution-mapi.mo
+share/locale/gu/LC_MESSAGES/evolution-mapi.mo
+share/locale/he/LC_MESSAGES/evolution-mapi.mo
+share/locale/hi/LC_MESSAGES/evolution-mapi.mo
+share/locale/hu/LC_MESSAGES/evolution-mapi.mo
+share/locale/it/LC_MESSAGES/evolution-mapi.mo
+share/locale/ja/LC_MESSAGES/evolution-mapi.mo
+share/locale/kn/LC_MESSAGES/evolution-mapi.mo
+share/locale/ko/LC_MESSAGES/evolution-mapi.mo
+share/locale/lt/LC_MESSAGES/evolution-mapi.mo
+share/locale/mai/LC_MESSAGES/evolution-mapi.mo
+share/locale/ml/LC_MESSAGES/evolution-mapi.mo
+share/locale/mr/LC_MESSAGES/evolution-mapi.mo
+share/locale/nb/LC_MESSAGES/evolution-mapi.mo
+share/locale/nl/LC_MESSAGES/evolution-mapi.mo
+share/locale/or/LC_MESSAGES/evolution-mapi.mo
+share/locale/pa/LC_MESSAGES/evolution-mapi.mo
+share/locale/pl/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-mapi.mo
+share/locale/ro/LC_MESSAGES/evolution-mapi.mo
+share/locale/ru/LC_MESSAGES/evolution-mapi.mo
+share/locale/si/LC_MESSAGES/evolution-mapi.mo
+share/locale/sk/LC_MESSAGES/evolution-mapi.mo
+share/locale/sl/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-mapi.mo
+share/locale/sv/LC_MESSAGES/evolution-mapi.mo
+share/locale/ta/LC_MESSAGES/evolution-mapi.mo
+share/locale/te/LC_MESSAGES/evolution-mapi.mo
+share/locale/th/LC_MESSAGES/evolution-mapi.mo
+share/locale/tr/LC_MESSAGES/evolution-mapi.mo
+share/locale/uk/LC_MESSAGES/evolution-mapi.mo
+share/locale/vi/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
+libdata/pkgconfig/libexchangemapi-1.0.pc
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
+@dirrmtry share/local/zh_TW/LC_MESSAGES
+@dirrmtry share/local/zh_TW
+@dirrmtry share/local/zh_HK/LC_MESSAGES
+@dirrmtry share/local/zh_HK
+@dirrmtry share/local/zh_CN/LC_MESSAGES
+@dirrmtry share/local/zh_CN
+@dirrmtry share/local/te/LC_MESSAGES
+@dirrmtry share/local/te
+@dirrmtry share/local/sr@latin/LC_MESSAGES
+@dirrmtry share/local/sr@latin
+@dirrmtry share/local/si/LC_MESSAGES
+@dirrmtry share/local/si
+@dirrmtry share/local/mr/LC_MESSAGES
+@dirrmtry share/local/mr
+@dirrmtry share/local/mai/LC_MESSAGES
+@dirrmtry share/local/mai
+@dirrmtry share/local/ca@valencia/LC_MESSAGES
+@dirrmtry share/local/ca@valencia
+@dirrmtry share/local/bn_IN/LC_MESSAGES
+@dirrmtry share/local/bn_IN
+@dirrmtry share/local/as/LC_MESSAGES
+@dirrmtry share/local/as
+@dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
+@dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 38d858c774bc..b03c7a0141fe 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -15,6 +15,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	bsd-sharp@googlegroups.com
 COMMENT=	Mono bindings for evolution
 
+BROKEN=		Doesn't accept current evolution version
+
 BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2efccc09f603..4b1da19b9829 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/evolution/Makefile,v 1.3 2009/04/16 01:08:59 kwm Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.204 2009/10/18 05:39:30 marcus Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,7 +23,7 @@ USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
-		desktopfileutils gnomedocutils ltasneededhack
+		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
 USE_AUTOTOOLS=	libtool:22
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
@@ -32,6 +31,7 @@ USE_LDCONFIG=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--enable-mono=no \
+		--disable-nm \
 		--with-sub-version=" FreeBSD GNOME Team Port"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -47,7 +47,7 @@ GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		bogo-junk-plugin.schemas \
 		evolution-mail.schemas
 
-EVO_VERSION=	2.26
+EVO_VERSION=	2.28
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
@@ -93,6 +93,7 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
+		-e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \
 	    	${WRKSRC}/iconv-detect.c
@@ -101,8 +102,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
 		${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
 
-post-install: install-ldconfig-file
-	${MKDIR} ${PREFIX}/include/evolution-${EVO_VERSION}/composer
-	${INSTALL_DATA} ${WRKSRC}/composer/e-msg*.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer
-
 .include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index fa11bd62cc09..6fa96677d8c9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.26.3.tar.bz2) = fcc487503ab91b9e25fd529abc87fdae
-SHA256 (gnome2/evolution-2.26.3.tar.bz2) = e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
-SIZE (gnome2/evolution-2.26.3.tar.bz2) = 36427464
+MD5 (gnome2/evolution-2.28.1.tar.bz2) = 15043e64f22000f6f0bf57e0373c7169
+SHA256 (gnome2/evolution-2.28.1.tar.bz2) = 5faf63e769f41ee9e4d857f5ac3bcae1fe45c57a3dbd4873402281c3aec7a135
+SIZE (gnome2/evolution-2.28.1.tar.bz2) = 29728219
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index ef43e24cddc7..44b3591906fe 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,23 +1,23 @@
---- configure.orig	2007-10-28 12:24:23.000000000 -0500
-+++ configure	2007-10-28 12:26:19.000000000 -0500
-@@ -23831,6 +23831,16 @@
-     SOFTOKN3_LIB=''
-     HAL_REQUIREMENT=''
-     ;;
+--- configure.orig	2009-08-24 11:10:44.000000000 +0200
++++ configure	2009-08-24 11:13:05.000000000 +0200
+@@ -16389,6 +16389,16 @@ case "$host" in
+ 	SOFTOKN3_LIB=''
+ 	HAL_REQUIREMENT=''
+ 	;;
 +*freebsd*) os_win32=no
-+    NO_UNDEFINED=''
-+    SOCKET_LIBS=''
-+    SOEXT='.so'
-+    SA_JUNK_PLUGIN=sa-junk-plugin
-+    BF_JUNK_PLUGIN=bogo-junk-plugin
-+    DL_LIB=''
-+    SOFTOKN3_LIB='-lsoftokn3'
-+    HAL_REQUIREMENT='hal'
-+    ;;
- *)  os_win32=no
-     NO_UNDEFINED=''
-     SOEXT='.so'
-@@ -25449,6 +25459,7 @@
++	NO_UNDEFINED=''
++	SOCKET_LIBS=''
++	SOEXT='.so'
++	SA_JUNK_PLUGIN=sa-junk-plugin
++	BF_JUNK_PLUGIN=bogo-junk-plugin
++	DL_LIB=''
++	SOFTOKN3_LIB='-lsoftokn3'
++	HAL_REQUIREMENT='hal'
++	;;
+ *)
+ 	os_win32=no
+ 	NO_UNDEFINED=''
+@@ -18403,6 +18413,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -25,16 +25,16 @@
  
  		#define BUFSIZE (sizeof(struct hostent)+10)
  
-@@ -29382,7 +29393,7 @@
- 	LDFLAGS_save="$LDFLAGS"
+@@ -22101,7 +22112,7 @@ if test "x${with_krb5}" != "xno"; then
+ 	LIBS_save="$LIBS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
 -	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 +	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
  	sunlibs="-lkrb5 -lgss"
- 	{ echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
-@@ -37936,7 +37947,7 @@
+ 	{ $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ $as_echo_n "checking for Kerberos 5... " >&6; }
+@@ -30112,7 +30123,7 @@ componentdir="$privlibdir/components"
  idldir='${datadir}'/idl/evolution-$BASE_VERSION
  
  
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
deleted file mode 100644
index b3e7b9ffbe25..000000000000
--- a/mail/evolution/files/patch-mail_em-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
-+++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
-@@ -23,6 +23,7 @@
- #ifndef __EM_UTILS_H__
- #define __EM_UTILS_H__
- 
-+#include <sys/types.h>
- #include <glib.h>
- 
- #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
deleted file mode 100644
index 800f60386963..000000000000
--- a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig	2007-11-30 05:24:05.000000000 +0100
-+++ widgets/e-timezone-dialog/e-timezone-dialog.c	2007-12-21 16:24:39.000000000 +0100
-@@ -82,7 +82,9 @@
- 
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
-+#ifndef __BSD_VISIBLE
- extern long timezone;
-+#endif
- extern int daylight;
- #endif
- 
-@@ -326,9 +328,20 @@
- get_local_timezone(void)
- {
- 	icaltimezone *zone;
-+	long offset;
-+#ifdef __BSD_VISIBLE
-+	time_t tt;
-+	struct tm tm;
-+#endif
- 
- 	tzset();
--	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+#ifdef __BSD_VISIBLE
-+	localtime_r (&tt, &tm);
-+	offset = tm.tm_gmtoff;
-+#else
-+	offset = -timezone;
-+#endif
-+	zone =  icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
- 
- 	return zone;
- }
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 9ed41eb95f9a..7f20b345c6c8 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -2,32 +2,111 @@ bin/evolution
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
+include/evolution-%%VERSION%%/calendar/gui/cal-editor-utils.h
+include/evolution-%%VERSION%%/calendar/gui/cal-search-bar.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-config.h
+include/evolution-%%VERSION%%/calendar/gui/comp-util.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-list-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-attachment-select-file.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-prefs-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/calendar-setup.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cancel-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/changed-comp.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor-util.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/copy-source-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/delete-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/delete-error.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/e-delegate-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/e-send-options-utils.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/event-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/event-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/memo-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/memo-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/recur-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/recurrence-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/save-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/schedule-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/select-source-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/send-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-details-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-page.h
+include/evolution-%%VERSION%%/calendar/gui/e-alarm-list.h
+include/evolution-%%VERSION%%/calendar/gui/e-attachment-handler-calendar.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-event.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-model-calendar.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-model.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-popup.h
+include/evolution-%%VERSION%%/calendar/gui/e-calendar-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-cell-date-edit-text.h
+include/evolution-%%VERSION%%/calendar/gui/e-comp-editor-registry.h
+include/evolution-%%VERSION%%/calendar/gui/e-date-edit-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-date-time-list.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-layout.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-main-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-time-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-top-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-attendee.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-list-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-store.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-types.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-utils.h
+include/evolution-%%VERSION%%/calendar/gui/e-mini-calendar-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-select-names-editable.h
+include/evolution-%%VERSION%%/calendar/gui/e-select-names-renderer.h
+include/evolution-%%VERSION%%/calendar/gui/e-timezone-entry.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-event-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-layout.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-main-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-titles-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view.h
+include/evolution-%%VERSION%%/calendar/gui/goto.h
 include/evolution-%%VERSION%%/calendar/gui/itip-utils.h
+include/evolution-%%VERSION%%/calendar/gui/misc.h
+include/evolution-%%VERSION%%/calendar/gui/tag-calendar.h
+include/evolution-%%VERSION%%/calendar/gui/weekday-picker.h
+include/evolution-%%VERSION%%/composer/e-composer-actions.h
+include/evolution-%%VERSION%%/composer/e-composer-autosave.h
+include/evolution-%%VERSION%%/composer/e-composer-common.h
+include/evolution-%%VERSION%%/composer/e-composer-from-header.h
+include/evolution-%%VERSION%%/composer/e-composer-header-table.h
+include/evolution-%%VERSION%%/composer/e-composer-header.h
+include/evolution-%%VERSION%%/composer/e-composer-name-header.h
+include/evolution-%%VERSION%%/composer/e-composer-post-header.h
+include/evolution-%%VERSION%%/composer/e-composer-private.h
+include/evolution-%%VERSION%%/composer/e-composer-text-header.h
 include/evolution-%%VERSION%%/composer/e-msg-composer.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
 include/evolution-%%VERSION%%/e-util/e-bconf-map.h
+include/evolution-%%VERSION%%/e-util/e-binding.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
-include/evolution-%%VERSION%%/e-util/e-config-listener.h
 include/evolution-%%VERSION%%/e-util/e-config.h
 include/evolution-%%VERSION%%/e-util/e-corba-utils.h
 include/evolution-%%VERSION%%/e-util/e-cursor.h
+include/evolution-%%VERSION%%/e-util/e-datetime-format.h
 include/evolution-%%VERSION%%/e-util/e-dialog-utils.h
 include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h
 include/evolution-%%VERSION%%/e-util/e-error.h
 include/evolution-%%VERSION%%/e-util/e-event.h
 include/evolution-%%VERSION%%/e-util/e-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-fsutils.h
-include/evolution-%%VERSION%%/e-util/e-gui-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
 include/evolution-%%VERSION%%/e-util/e-import.h
 include/evolution-%%VERSION%%/e-util/e-logger.h
+include/evolution-%%VERSION%%/e-util/e-marshal.h
 include/evolution-%%VERSION%%/e-util/e-menu.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
 include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h
@@ -45,13 +124,33 @@ include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
 include/evolution-%%VERSION%%/e-util/e-util-labels.h
-include/evolution-%%VERSION%%/e-util/e-util-marshal.h
 include/evolution-%%VERSION%%/e-util/e-util.h
 include/evolution-%%VERSION%%/e-util/e-xml-utils.h
+include/evolution-%%VERSION%%/filter/filter-code.h
+include/evolution-%%VERSION%%/filter/filter-colour.h
+include/evolution-%%VERSION%%/filter/filter-datespec.h
+include/evolution-%%VERSION%%/filter/filter-element.h
+include/evolution-%%VERSION%%/filter/filter-file.h
+include/evolution-%%VERSION%%/filter/filter-input.h
+include/evolution-%%VERSION%%/filter/filter-int.h
+include/evolution-%%VERSION%%/filter/filter-option.h
+include/evolution-%%VERSION%%/filter/filter-part.h
+include/evolution-%%VERSION%%/filter/filter-rule.h
+include/evolution-%%VERSION%%/filter/rule-context.h
+include/evolution-%%VERSION%%/filter/rule-editor.h
 include/evolution-%%VERSION%%/mail/Evolution-Mail.h
+include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h
+include/evolution-%%VERSION%%/mail/e-mail-search-bar.h
+include/evolution-%%VERSION%%/mail/e-searching-tokenizer.h
+include/evolution-%%VERSION%%/mail/em-account-editor.h
 include/evolution-%%VERSION%%/mail/em-composer-utils.h
 include/evolution-%%VERSION%%/mail/em-config.h
 include/evolution-%%VERSION%%/mail/em-event.h
+include/evolution-%%VERSION%%/mail/em-filter-context.h
+include/evolution-%%VERSION%%/mail/em-filter-editor.h
+include/evolution-%%VERSION%%/mail/em-filter-folder-element.h
+include/evolution-%%VERSION%%/mail/em-filter-rule.h
+include/evolution-%%VERSION%%/mail/em-filter-source-element.h
 include/evolution-%%VERSION%%/mail/em-folder-browser.h
 include/evolution-%%VERSION%%/mail/em-folder-tree-model.h
 include/evolution-%%VERSION%%/mail/em-folder-tree.h
@@ -70,14 +169,17 @@ include/evolution-%%VERSION%%/mail/em-junk-hook.h
 include/evolution-%%VERSION%%/mail/em-menu.h
 include/evolution-%%VERSION%%/mail/em-message-browser.h
 include/evolution-%%VERSION%%/mail/em-popup.h
+include/evolution-%%VERSION%%/mail/em-search-context.h
 include/evolution-%%VERSION%%/mail/em-stripsig-filter.h
 include/evolution-%%VERSION%%/mail/em-sync-stream.h
 include/evolution-%%VERSION%%/mail/em-utils.h
 include/evolution-%%VERSION%%/mail/mail-autofilter.h
 include/evolution-%%VERSION%%/mail/mail-component.h
 include/evolution-%%VERSION%%/mail/mail-config.h
+include/evolution-%%VERSION%%/mail/mail-folder-cache.h
 include/evolution-%%VERSION%%/mail/mail-mt.h
 include/evolution-%%VERSION%%/mail/mail-ops.h
+include/evolution-%%VERSION%%/mail/mail-send-recv.h
 include/evolution-%%VERSION%%/mail/mail-session.h
 include/evolution-%%VERSION%%/mail/mail-tools.h
 include/evolution-%%VERSION%%/mail/mail-vfolder.h
@@ -94,7 +196,16 @@ include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
 include/evolution-%%VERSION%%/menus/gal-view.h
 include/evolution-%%VERSION%%/misc/e-account-combo-box.h
 include/evolution-%%VERSION%%/misc/e-activity-handler.h
-include/evolution-%%VERSION%%/misc/e-attachment-bar.h
+include/evolution-%%VERSION%%/misc/e-attachment-button.h
+include/evolution-%%VERSION%%/misc/e-attachment-dialog.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler-image.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler-sendto.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler.h
+include/evolution-%%VERSION%%/misc/e-attachment-icon-view.h
+include/evolution-%%VERSION%%/misc/e-attachment-paned.h
+include/evolution-%%VERSION%%/misc/e-attachment-store.h
+include/evolution-%%VERSION%%/misc/e-attachment-tree-view.h
+include/evolution-%%VERSION%%/misc/e-attachment-view.h
 include/evolution-%%VERSION%%/misc/e-attachment.h
 include/evolution-%%VERSION%%/misc/e-calendar-item.h
 include/evolution-%%VERSION%%/misc/e-calendar.h
@@ -113,7 +224,7 @@ include/evolution-%%VERSION%%/misc/e-config-page.h
 include/evolution-%%VERSION%%/misc/e-cursors.h
 include/evolution-%%VERSION%%/misc/e-dateedit.h
 include/evolution-%%VERSION%%/misc/e-dropdown-button.h
-include/evolution-%%VERSION%%/misc/e-expander.h
+include/evolution-%%VERSION%%/misc/e-filter-bar.h
 include/evolution-%%VERSION%%/misc/e-gui-utils.h
 include/evolution-%%VERSION%%/misc/e-hsv-utils.h
 include/evolution-%%VERSION%%/misc/e-icon-entry.h
@@ -292,6 +403,10 @@ lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-cal-shared.a
+lib/evolution/%%VERSION%%/libevolution-cal-shared.la
+lib/evolution/%%VERSION%%/libevolution-cal-shared.so
+lib/evolution/%%VERSION%%/libevolution-cal-shared.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
@@ -304,6 +419,10 @@ lib/evolution/%%VERSION%%/libevolution-mail-importers.a
 lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-mail-shared.a
+lib/evolution/%%VERSION%%/libevolution-mail-shared.la
+lib/evolution/%%VERSION%%/libevolution-mail-shared.so
+lib/evolution/%%VERSION%%/libevolution-mail-shared.so.0
 lib/evolution/%%VERSION%%/libevolution-smime.a
 lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
@@ -366,9 +485,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
@@ -378,9 +494,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
@@ -429,6 +542,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml
@@ -445,14 +561,12 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-attachment-reminder.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-face.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
@@ -476,6 +590,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-vcard-inline.eplug
 lib/evolution/%%VERSION%%/plugins/templates.glade
 libdata/bonobo/servers/GNOME_Evolution_Addressbook.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar.server
@@ -509,6 +624,7 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/default/nl/mail/local/Inbox
 %%DATADIR%%/%%VERSION%%/default/pl/mail/local/Inbox
 %%DATADIR%%/%%VERSION%%/default/pt/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/ro/mail/local/Inbox
 %%DATADIR%%/%%VERSION%%/default/sr/mail/local/Inbox
 %%DATADIR%%/%%VERSION%%/default/sr@latin/mail/local/Inbox
 %%DATADIR%%/%%VERSION%%/default/sv/mail/local/Inbox
@@ -526,13 +642,13 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-face.errors.xml
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-errors.xml
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-process-meeting.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-login.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-shared-folder.error
 %%DATADIR%%/%%VERSION%%/errors/shell.error
 %%DATADIR%%/%%VERSION%%/etspec/e-addressbook-view.etspec
 %%DATADIR%%/%%VERSION%%/etspec/e-cal-list-view.etspec
@@ -548,8 +664,6 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/glade/contact-editor.glade
 %%DATADIR%%/%%VERSION%%/glade/contact-list-editor.glade
 %%DATADIR%%/%%VERSION%%/glade/e-active-connection-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/e-attachment.glade
-%%DATADIR%%/%%VERSION%%/glade/e-contact-print.glade
 %%DATADIR%%/%%VERSION%%/glade/e-delegate-dialog.glade
 %%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade
 %%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade
@@ -569,21 +683,17 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
 %%DATADIR%%/%%VERSION%%/glade/exchange-send-options.glade
 %%DATADIR%%/%%VERSION%%/glade/filter.glade
-%%DATADIR%%/%%VERSION%%/glade/fulladdr.glade
 %%DATADIR%%/%%VERSION%%/glade/fullname.glade
-%%DATADIR%%/%%VERSION%%/glade/gal-categories.glade
 %%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
 %%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
 %%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
 %%DATADIR%%/%%VERSION%%/glade/goto-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/im.glade
 %%DATADIR%%/%%VERSION%%/glade/imap-headers.glade
 %%DATADIR%%/%%VERSION%%/glade/import.glade
 %%DATADIR%%/%%VERSION%%/glade/junk-settings.glade
 %%DATADIR%%/%%VERSION%%/glade/ldap-config.glade
 %%DATADIR%%/%%VERSION%%/glade/mail-config.glade
 %%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade
-%%DATADIR%%/%%VERSION%%/glade/meeting-page.glade
 %%DATADIR%%/%%VERSION%%/glade/memo-page.glade
 %%DATADIR%%/%%VERSION%%/glade/org-gnome-email-custom-header.glade
 %%DATADIR%%/%%VERSION%%/glade/properties.glade
@@ -622,6 +732,7 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-inbox.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-sent.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/status/wrapped.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/go-today.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-day.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-list.png
@@ -711,51 +822,31 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png
 %%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png
 share/gnome/help/evolution/C/evolution.xml
-share/gnome/help/evolution/C/figures/account_editor_a.png
 share/gnome/help/evolution/C/figures/attach_reminder_a.png
+share/gnome/help/evolution/C/figures/calendar_preference_display.png
 share/gnome/help/evolution/C/figures/categories_a.png
-share/gnome/help/evolution/C/figures/collap_head_a.png
-share/gnome/help/evolution/C/figures/config-cal.png
-share/gnome/help/evolution/C/figures/config-mail.png
 share/gnome/help/evolution/C/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/C/figures/delgt-add.png
 share/gnome/help/evolution/C/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/C/figures/evo_account_editor_a.png
 share/gnome/help/evolution/C/figures/evo_adv_search_a.png
-share/gnome/help/evolution/C/figures/evo_allday_a.png
 share/gnome/help/evolution/C/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/C/figures/evo_backup.png
 share/gnome/help/evolution/C/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/C/figures/evo_backup_warning.png
 share/gnome/help/evolution/C/figures/evo_blink.png
-share/gnome/help/evolution/C/figures/evo_cal_a.png
-share/gnome/help/evolution/C/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/C/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/C/figures/evo_calstatus_a.png
 share/gnome/help/evolution/C/figures/evo_caltasks_a.png
 share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/C/figures/evo_crash_recovery.png
-share/gnome/help/evolution/C/figures/evo_custom_header.png
-share/gnome/help/evolution/C/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/C/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/C/figures/evo_dialog-info.png
 share/gnome/help/evolution/C/figures/evo_dialog-warning.png
-share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/C/figures/evo_edit_search.png
 share/gnome/help/evolution/C/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/C/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/C/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/C/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/C/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/C/figures/evo_identity_a.png
-share/gnome/help/evolution/C/figures/evo_identityedit_a.png
-share/gnome/help/evolution/C/figures/evo_imapheader_a.png
 share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/C/figures/evo_import.png
-share/gnome/help/evolution/C/figures/evo_import_asst_a.png
 share/gnome/help/evolution/C/figures/evo_junk_a.png
 share/gnome/help/evolution/C/figures/evo_label_a.png
 share/gnome/help/evolution/C/figures/evo_labels_a.png
@@ -765,93 +856,64 @@ share/gnome/help/evolution/C/figures/evo_mail_notifier.png
 share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/C/figures/evo_memo_a.png
-share/gnome/help/evolution/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution/C/figures/evo_message_filters_a.png
 share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/C/figures/evo_newmail.png
 share/gnome/help/evolution/C/figures/evo_newmess_a.png
 share/gnome/help/evolution/C/figures/evo_offline.png
 share/gnome/help/evolution/C/figures/evo_popreceive_a.png
 share/gnome/help/evolution/C/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/C/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/C/figures/evo_rule_a.png
-share/gnome/help/evolution/C/figures/evo_select_add_folder.png
-share/gnome/help/evolution/C/figures/evo_select_folder.png
 share/gnome/help/evolution/C/figures/evo_send_option_a.png
 share/gnome/help/evolution/C/figures/evo_send_setup_a.png
 share/gnome/help/evolution/C/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/C/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/C/figures/evo_timezone_a.png
 share/gnome/help/evolution/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution/C/figures/exchg-identity.png
-share/gnome/help/evolution/C/figures/exchng-identity.png
-share/gnome/help/evolution/C/figures/exchng-rec-mail.png
+share/gnome/help/evolution/C/figures/evolution_contact_preference.png
+share/gnome/help/evolution/C/figures/evolution_mail_preference.png
 share/gnome/help/evolution/C/figures/exchng-rec-mails.png
-share/gnome/help/evolution/C/figures/exchng-rec-option.png
 share/gnome/help/evolution/C/figures/exchng-rec-options.png
-share/gnome/help/evolution/C/figures/exchng-settings.png
 share/gnome/help/evolution/C/figures/filter-new-fig.png
-share/gnome/help/evolution/C/figures/free_busy.png
+share/gnome/help/evolution/C/figures/folder_plus.png
+share/gnome/help/evolution/C/figures/folder_size_mapi.png
+share/gnome/help/evolution/C/figures/folder_size_preference.png
 share/gnome/help/evolution/C/figures/google_cal_view.png
-share/gnome/help/evolution/C/figures/mail-threaded.png
+share/gnome/help/evolution/C/figures/groupwise_resend.png
+share/gnome/help/evolution/C/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/C/figures/local_ics_calendar.png
 share/gnome/help/evolution/C/figures/mailer_preferences.png
+share/gnome/help/evolution/C/figures/meeting.png
 share/gnome/help/evolution/C/figures/minus.png
 share/gnome/help/evolution/C/figures/plus.png
-share/gnome/help/evolution/C/figures/proxy-cal.png
-share/gnome/help/evolution/C/figures/proxy-login.png
 share/gnome/help/evolution/C/figures/quick_add_a.png
 share/gnome/help/evolution/C/figures/quick_reference.png
 share/gnome/help/evolution/C/figures/stock_search.png
-share/gnome/help/evolution/C/figures/sub-others-folder.png
-share/gnome/help/evolution/C/figures/sub-pub-fold.png
 share/gnome/help/evolution/C/figures/ver_view_a.png
 share/gnome/help/evolution/cs/evolution.xml
-share/gnome/help/evolution/cs/figures/account_editor_a.png
 share/gnome/help/evolution/cs/figures/attach_reminder_a.png
+share/gnome/help/evolution/cs/figures/calendar_preference_display.png
 share/gnome/help/evolution/cs/figures/categories_a.png
-share/gnome/help/evolution/cs/figures/collap_head_a.png
-share/gnome/help/evolution/cs/figures/config-cal.png
-share/gnome/help/evolution/cs/figures/config-mail.png
 share/gnome/help/evolution/cs/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/cs/figures/delgt-add.png
 share/gnome/help/evolution/cs/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/cs/figures/evo_account_editor_a.png
 share/gnome/help/evolution/cs/figures/evo_adv_search_a.png
-share/gnome/help/evolution/cs/figures/evo_allday_a.png
 share/gnome/help/evolution/cs/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/cs/figures/evo_backup.png
 share/gnome/help/evolution/cs/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/cs/figures/evo_backup_warning.png
 share/gnome/help/evolution/cs/figures/evo_blink.png
-share/gnome/help/evolution/cs/figures/evo_cal_a.png
-share/gnome/help/evolution/cs/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/cs/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/cs/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/cs/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/cs/figures/evo_calstatus_a.png
 share/gnome/help/evolution/cs/figures/evo_caltasks_a.png
 share/gnome/help/evolution/cs/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/cs/figures/evo_crash_recovery.png
-share/gnome/help/evolution/cs/figures/evo_custom_header.png
-share/gnome/help/evolution/cs/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/cs/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/cs/figures/evo_dialog-info.png
 share/gnome/help/evolution/cs/figures/evo_dialog-warning.png
-share/gnome/help/evolution/cs/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/cs/figures/evo_edit_search.png
 share/gnome/help/evolution/cs/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/cs/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/cs/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/cs/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/cs/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/cs/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/cs/figures/evo_identity_a.png
-share/gnome/help/evolution/cs/figures/evo_identityedit_a.png
-share/gnome/help/evolution/cs/figures/evo_imapheader_a.png
 share/gnome/help/evolution/cs/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/cs/figures/evo_import.png
-share/gnome/help/evolution/cs/figures/evo_import_asst_a.png
 share/gnome/help/evolution/cs/figures/evo_junk_a.png
 share/gnome/help/evolution/cs/figures/evo_label_a.png
 share/gnome/help/evolution/cs/figures/evo_labels_a.png
@@ -861,93 +923,64 @@ share/gnome/help/evolution/cs/figures/evo_mail_notifier.png
 share/gnome/help/evolution/cs/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_memo_a.png
-share/gnome/help/evolution/cs/figures/evo_mereceive_a.png
-share/gnome/help/evolution/cs/figures/evo_message_filters_a.png
 share/gnome/help/evolution/cs/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_newmail.png
 share/gnome/help/evolution/cs/figures/evo_newmess_a.png
 share/gnome/help/evolution/cs/figures/evo_offline.png
 share/gnome/help/evolution/cs/figures/evo_popreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/cs/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/cs/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/cs/figures/evo_rule_a.png
-share/gnome/help/evolution/cs/figures/evo_select_add_folder.png
-share/gnome/help/evolution/cs/figures/evo_select_folder.png
 share/gnome/help/evolution/cs/figures/evo_send_option_a.png
 share/gnome/help/evolution/cs/figures/evo_send_setup_a.png
 share/gnome/help/evolution/cs/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/cs/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/cs/figures/evo_timezone_a.png
 share/gnome/help/evolution/cs/figures/evo_usereceive_a.png
-share/gnome/help/evolution/cs/figures/exchg-identity.png
-share/gnome/help/evolution/cs/figures/exchng-identity.png
-share/gnome/help/evolution/cs/figures/exchng-rec-mail.png
+share/gnome/help/evolution/cs/figures/evolution_contact_preference.png
+share/gnome/help/evolution/cs/figures/evolution_mail_preference.png
 share/gnome/help/evolution/cs/figures/exchng-rec-mails.png
-share/gnome/help/evolution/cs/figures/exchng-rec-option.png
 share/gnome/help/evolution/cs/figures/exchng-rec-options.png
-share/gnome/help/evolution/cs/figures/exchng-settings.png
 share/gnome/help/evolution/cs/figures/filter-new-fig.png
-share/gnome/help/evolution/cs/figures/free_busy.png
+share/gnome/help/evolution/cs/figures/folder_plus.png
+share/gnome/help/evolution/cs/figures/folder_size_mapi.png
+share/gnome/help/evolution/cs/figures/folder_size_preference.png
 share/gnome/help/evolution/cs/figures/google_cal_view.png
-share/gnome/help/evolution/cs/figures/mail-threaded.png
+share/gnome/help/evolution/cs/figures/groupwise_resend.png
+share/gnome/help/evolution/cs/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/cs/figures/local_ics_calendar.png
 share/gnome/help/evolution/cs/figures/mailer_preferences.png
+share/gnome/help/evolution/cs/figures/meeting.png
 share/gnome/help/evolution/cs/figures/minus.png
 share/gnome/help/evolution/cs/figures/plus.png
-share/gnome/help/evolution/cs/figures/proxy-cal.png
-share/gnome/help/evolution/cs/figures/proxy-login.png
 share/gnome/help/evolution/cs/figures/quick_add_a.png
 share/gnome/help/evolution/cs/figures/quick_reference.png
 share/gnome/help/evolution/cs/figures/stock_search.png
-share/gnome/help/evolution/cs/figures/sub-others-folder.png
-share/gnome/help/evolution/cs/figures/sub-pub-fold.png
 share/gnome/help/evolution/cs/figures/ver_view_a.png
 share/gnome/help/evolution/de/evolution.xml
-share/gnome/help/evolution/de/figures/account_editor_a.png
 share/gnome/help/evolution/de/figures/attach_reminder_a.png
+share/gnome/help/evolution/de/figures/calendar_preference_display.png
 share/gnome/help/evolution/de/figures/categories_a.png
-share/gnome/help/evolution/de/figures/collap_head_a.png
-share/gnome/help/evolution/de/figures/config-cal.png
-share/gnome/help/evolution/de/figures/config-mail.png
 share/gnome/help/evolution/de/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/de/figures/delgt-add.png
 share/gnome/help/evolution/de/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/de/figures/evo_account_editor_a.png
 share/gnome/help/evolution/de/figures/evo_adv_search_a.png
-share/gnome/help/evolution/de/figures/evo_allday_a.png
 share/gnome/help/evolution/de/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/de/figures/evo_backup.png
 share/gnome/help/evolution/de/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/de/figures/evo_backup_warning.png
 share/gnome/help/evolution/de/figures/evo_blink.png
-share/gnome/help/evolution/de/figures/evo_cal_a.png
-share/gnome/help/evolution/de/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/de/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/de/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/de/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/de/figures/evo_calstatus_a.png
 share/gnome/help/evolution/de/figures/evo_caltasks_a.png
 share/gnome/help/evolution/de/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/de/figures/evo_crash_recovery.png
-share/gnome/help/evolution/de/figures/evo_custom_header.png
-share/gnome/help/evolution/de/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/de/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/de/figures/evo_dialog-info.png
 share/gnome/help/evolution/de/figures/evo_dialog-warning.png
-share/gnome/help/evolution/de/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/de/figures/evo_edit_search.png
 share/gnome/help/evolution/de/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/de/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/de/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/de/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/de/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/de/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/de/figures/evo_identity_a.png
-share/gnome/help/evolution/de/figures/evo_identityedit_a.png
-share/gnome/help/evolution/de/figures/evo_imapheader_a.png
 share/gnome/help/evolution/de/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/de/figures/evo_import.png
-share/gnome/help/evolution/de/figures/evo_import_asst_a.png
 share/gnome/help/evolution/de/figures/evo_junk_a.png
 share/gnome/help/evolution/de/figures/evo_label_a.png
 share/gnome/help/evolution/de/figures/evo_labels_a.png
@@ -957,93 +990,64 @@ share/gnome/help/evolution/de/figures/evo_mail_notifier.png
 share/gnome/help/evolution/de/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/de/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/de/figures/evo_memo_a.png
-share/gnome/help/evolution/de/figures/evo_mereceive_a.png
-share/gnome/help/evolution/de/figures/evo_message_filters_a.png
 share/gnome/help/evolution/de/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/de/figures/evo_newmail.png
 share/gnome/help/evolution/de/figures/evo_newmess_a.png
 share/gnome/help/evolution/de/figures/evo_offline.png
 share/gnome/help/evolution/de/figures/evo_popreceive_a.png
 share/gnome/help/evolution/de/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/de/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/de/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/de/figures/evo_rule_a.png
-share/gnome/help/evolution/de/figures/evo_select_add_folder.png
-share/gnome/help/evolution/de/figures/evo_select_folder.png
 share/gnome/help/evolution/de/figures/evo_send_option_a.png
 share/gnome/help/evolution/de/figures/evo_send_setup_a.png
 share/gnome/help/evolution/de/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/de/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/de/figures/evo_timezone_a.png
 share/gnome/help/evolution/de/figures/evo_usereceive_a.png
-share/gnome/help/evolution/de/figures/exchg-identity.png
-share/gnome/help/evolution/de/figures/exchng-identity.png
-share/gnome/help/evolution/de/figures/exchng-rec-mail.png
+share/gnome/help/evolution/de/figures/evolution_contact_preference.png
+share/gnome/help/evolution/de/figures/evolution_mail_preference.png
 share/gnome/help/evolution/de/figures/exchng-rec-mails.png
-share/gnome/help/evolution/de/figures/exchng-rec-option.png
 share/gnome/help/evolution/de/figures/exchng-rec-options.png
-share/gnome/help/evolution/de/figures/exchng-settings.png
 share/gnome/help/evolution/de/figures/filter-new-fig.png
-share/gnome/help/evolution/de/figures/free_busy.png
+share/gnome/help/evolution/de/figures/folder_plus.png
+share/gnome/help/evolution/de/figures/folder_size_mapi.png
+share/gnome/help/evolution/de/figures/folder_size_preference.png
 share/gnome/help/evolution/de/figures/google_cal_view.png
-share/gnome/help/evolution/de/figures/mail-threaded.png
+share/gnome/help/evolution/de/figures/groupwise_resend.png
+share/gnome/help/evolution/de/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/de/figures/local_ics_calendar.png
 share/gnome/help/evolution/de/figures/mailer_preferences.png
+share/gnome/help/evolution/de/figures/meeting.png
 share/gnome/help/evolution/de/figures/minus.png
 share/gnome/help/evolution/de/figures/plus.png
-share/gnome/help/evolution/de/figures/proxy-cal.png
-share/gnome/help/evolution/de/figures/proxy-login.png
 share/gnome/help/evolution/de/figures/quick_add_a.png
 share/gnome/help/evolution/de/figures/quick_reference.png
 share/gnome/help/evolution/de/figures/stock_search.png
-share/gnome/help/evolution/de/figures/sub-others-folder.png
-share/gnome/help/evolution/de/figures/sub-pub-fold.png
 share/gnome/help/evolution/de/figures/ver_view_a.png
 share/gnome/help/evolution/el/evolution.xml
-share/gnome/help/evolution/el/figures/account_editor_a.png
 share/gnome/help/evolution/el/figures/attach_reminder_a.png
+share/gnome/help/evolution/el/figures/calendar_preference_display.png
 share/gnome/help/evolution/el/figures/categories_a.png
-share/gnome/help/evolution/el/figures/collap_head_a.png
-share/gnome/help/evolution/el/figures/config-cal.png
-share/gnome/help/evolution/el/figures/config-mail.png
 share/gnome/help/evolution/el/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/el/figures/delgt-add.png
 share/gnome/help/evolution/el/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/el/figures/evo_account_editor_a.png
 share/gnome/help/evolution/el/figures/evo_adv_search_a.png
-share/gnome/help/evolution/el/figures/evo_allday_a.png
 share/gnome/help/evolution/el/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/el/figures/evo_backup.png
 share/gnome/help/evolution/el/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/el/figures/evo_backup_warning.png
 share/gnome/help/evolution/el/figures/evo_blink.png
-share/gnome/help/evolution/el/figures/evo_cal_a.png
-share/gnome/help/evolution/el/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/el/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/el/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/el/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/el/figures/evo_calstatus_a.png
 share/gnome/help/evolution/el/figures/evo_caltasks_a.png
 share/gnome/help/evolution/el/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/el/figures/evo_crash_recovery.png
-share/gnome/help/evolution/el/figures/evo_custom_header.png
-share/gnome/help/evolution/el/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/el/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/el/figures/evo_dialog-info.png
 share/gnome/help/evolution/el/figures/evo_dialog-warning.png
-share/gnome/help/evolution/el/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/el/figures/evo_edit_search.png
 share/gnome/help/evolution/el/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/el/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/el/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/el/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/el/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/el/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/el/figures/evo_identity_a.png
-share/gnome/help/evolution/el/figures/evo_identityedit_a.png
-share/gnome/help/evolution/el/figures/evo_imapheader_a.png
 share/gnome/help/evolution/el/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/el/figures/evo_import.png
-share/gnome/help/evolution/el/figures/evo_import_asst_a.png
 share/gnome/help/evolution/el/figures/evo_junk_a.png
 share/gnome/help/evolution/el/figures/evo_label_a.png
 share/gnome/help/evolution/el/figures/evo_labels_a.png
@@ -1053,93 +1057,64 @@ share/gnome/help/evolution/el/figures/evo_mail_notifier.png
 share/gnome/help/evolution/el/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/el/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/el/figures/evo_memo_a.png
-share/gnome/help/evolution/el/figures/evo_mereceive_a.png
-share/gnome/help/evolution/el/figures/evo_message_filters_a.png
 share/gnome/help/evolution/el/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/el/figures/evo_newmail.png
 share/gnome/help/evolution/el/figures/evo_newmess_a.png
 share/gnome/help/evolution/el/figures/evo_offline.png
 share/gnome/help/evolution/el/figures/evo_popreceive_a.png
 share/gnome/help/evolution/el/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/el/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/el/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/el/figures/evo_rule_a.png
-share/gnome/help/evolution/el/figures/evo_select_add_folder.png
-share/gnome/help/evolution/el/figures/evo_select_folder.png
 share/gnome/help/evolution/el/figures/evo_send_option_a.png
 share/gnome/help/evolution/el/figures/evo_send_setup_a.png
 share/gnome/help/evolution/el/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/el/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/el/figures/evo_timezone_a.png
 share/gnome/help/evolution/el/figures/evo_usereceive_a.png
-share/gnome/help/evolution/el/figures/exchg-identity.png
-share/gnome/help/evolution/el/figures/exchng-identity.png
-share/gnome/help/evolution/el/figures/exchng-rec-mail.png
+share/gnome/help/evolution/el/figures/evolution_contact_preference.png
+share/gnome/help/evolution/el/figures/evolution_mail_preference.png
 share/gnome/help/evolution/el/figures/exchng-rec-mails.png
-share/gnome/help/evolution/el/figures/exchng-rec-option.png
 share/gnome/help/evolution/el/figures/exchng-rec-options.png
-share/gnome/help/evolution/el/figures/exchng-settings.png
 share/gnome/help/evolution/el/figures/filter-new-fig.png
-share/gnome/help/evolution/el/figures/free_busy.png
+share/gnome/help/evolution/el/figures/folder_plus.png
+share/gnome/help/evolution/el/figures/folder_size_mapi.png
+share/gnome/help/evolution/el/figures/folder_size_preference.png
 share/gnome/help/evolution/el/figures/google_cal_view.png
-share/gnome/help/evolution/el/figures/mail-threaded.png
+share/gnome/help/evolution/el/figures/groupwise_resend.png
+share/gnome/help/evolution/el/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/el/figures/local_ics_calendar.png
 share/gnome/help/evolution/el/figures/mailer_preferences.png
+share/gnome/help/evolution/el/figures/meeting.png
 share/gnome/help/evolution/el/figures/minus.png
 share/gnome/help/evolution/el/figures/plus.png
-share/gnome/help/evolution/el/figures/proxy-cal.png
-share/gnome/help/evolution/el/figures/proxy-login.png
 share/gnome/help/evolution/el/figures/quick_add_a.png
 share/gnome/help/evolution/el/figures/quick_reference.png
 share/gnome/help/evolution/el/figures/stock_search.png
-share/gnome/help/evolution/el/figures/sub-others-folder.png
-share/gnome/help/evolution/el/figures/sub-pub-fold.png
 share/gnome/help/evolution/el/figures/ver_view_a.png
 share/gnome/help/evolution/en_GB/evolution.xml
-share/gnome/help/evolution/en_GB/figures/account_editor_a.png
 share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png
+share/gnome/help/evolution/en_GB/figures/calendar_preference_display.png
 share/gnome/help/evolution/en_GB/figures/categories_a.png
-share/gnome/help/evolution/en_GB/figures/collap_head_a.png
-share/gnome/help/evolution/en_GB/figures/config-cal.png
-share/gnome/help/evolution/en_GB/figures/config-mail.png
 share/gnome/help/evolution/en_GB/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/en_GB/figures/delgt-add.png
 share/gnome/help/evolution/en_GB/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/en_GB/figures/evo_account_editor_a.png
 share/gnome/help/evolution/en_GB/figures/evo_adv_search_a.png
-share/gnome/help/evolution/en_GB/figures/evo_allday_a.png
 share/gnome/help/evolution/en_GB/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/en_GB/figures/evo_backup.png
 share/gnome/help/evolution/en_GB/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/en_GB/figures/evo_backup_warning.png
 share/gnome/help/evolution/en_GB/figures/evo_blink.png
-share/gnome/help/evolution/en_GB/figures/evo_cal_a.png
-share/gnome/help/evolution/en_GB/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/en_GB/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/en_GB/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/en_GB/figures/evo_calstatus_a.png
 share/gnome/help/evolution/en_GB/figures/evo_caltasks_a.png
 share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/en_GB/figures/evo_crash_recovery.png
-share/gnome/help/evolution/en_GB/figures/evo_custom_header.png
-share/gnome/help/evolution/en_GB/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/en_GB/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/en_GB/figures/evo_dialog-info.png
 share/gnome/help/evolution/en_GB/figures/evo_dialog-warning.png
-share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
 share/gnome/help/evolution/en_GB/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/en_GB/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/en_GB/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/en_GB/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/en_GB/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/en_GB/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/en_GB/figures/evo_identity_a.png
-share/gnome/help/evolution/en_GB/figures/evo_identityedit_a.png
-share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
 share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/en_GB/figures/evo_import.png
-share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
 share/gnome/help/evolution/en_GB/figures/evo_junk_a.png
 share/gnome/help/evolution/en_GB/figures/evo_label_a.png
 share/gnome/help/evolution/en_GB/figures/evo_labels_a.png
@@ -1149,93 +1124,64 @@ share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png
 share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
-share/gnome/help/evolution/en_GB/figures/evo_mereceive_a.png
-share/gnome/help/evolution/en_GB/figures/evo_message_filters_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_newmail.png
 share/gnome/help/evolution/en_GB/figures/evo_newmess_a.png
 share/gnome/help/evolution/en_GB/figures/evo_offline.png
 share/gnome/help/evolution/en_GB/figures/evo_popreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/en_GB/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/en_GB/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/en_GB/figures/evo_rule_a.png
-share/gnome/help/evolution/en_GB/figures/evo_select_add_folder.png
-share/gnome/help/evolution/en_GB/figures/evo_select_folder.png
 share/gnome/help/evolution/en_GB/figures/evo_send_option_a.png
 share/gnome/help/evolution/en_GB/figures/evo_send_setup_a.png
 share/gnome/help/evolution/en_GB/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/en_GB/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/en_GB/figures/evo_timezone_a.png
 share/gnome/help/evolution/en_GB/figures/evo_usereceive_a.png
-share/gnome/help/evolution/en_GB/figures/exchg-identity.png
-share/gnome/help/evolution/en_GB/figures/exchng-identity.png
-share/gnome/help/evolution/en_GB/figures/exchng-rec-mail.png
+share/gnome/help/evolution/en_GB/figures/evolution_contact_preference.png
+share/gnome/help/evolution/en_GB/figures/evolution_mail_preference.png
 share/gnome/help/evolution/en_GB/figures/exchng-rec-mails.png
-share/gnome/help/evolution/en_GB/figures/exchng-rec-option.png
 share/gnome/help/evolution/en_GB/figures/exchng-rec-options.png
-share/gnome/help/evolution/en_GB/figures/exchng-settings.png
 share/gnome/help/evolution/en_GB/figures/filter-new-fig.png
-share/gnome/help/evolution/en_GB/figures/free_busy.png
+share/gnome/help/evolution/en_GB/figures/folder_plus.png
+share/gnome/help/evolution/en_GB/figures/folder_size_mapi.png
+share/gnome/help/evolution/en_GB/figures/folder_size_preference.png
 share/gnome/help/evolution/en_GB/figures/google_cal_view.png
-share/gnome/help/evolution/en_GB/figures/mail-threaded.png
+share/gnome/help/evolution/en_GB/figures/groupwise_resend.png
+share/gnome/help/evolution/en_GB/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/en_GB/figures/local_ics_calendar.png
 share/gnome/help/evolution/en_GB/figures/mailer_preferences.png
+share/gnome/help/evolution/en_GB/figures/meeting.png
 share/gnome/help/evolution/en_GB/figures/minus.png
 share/gnome/help/evolution/en_GB/figures/plus.png
-share/gnome/help/evolution/en_GB/figures/proxy-cal.png
-share/gnome/help/evolution/en_GB/figures/proxy-login.png
 share/gnome/help/evolution/en_GB/figures/quick_add_a.png
 share/gnome/help/evolution/en_GB/figures/quick_reference.png
 share/gnome/help/evolution/en_GB/figures/stock_search.png
-share/gnome/help/evolution/en_GB/figures/sub-others-folder.png
-share/gnome/help/evolution/en_GB/figures/sub-pub-fold.png
 share/gnome/help/evolution/en_GB/figures/ver_view_a.png
 share/gnome/help/evolution/es/evolution.xml
-share/gnome/help/evolution/es/figures/account_editor_a.png
 share/gnome/help/evolution/es/figures/attach_reminder_a.png
+share/gnome/help/evolution/es/figures/calendar_preference_display.png
 share/gnome/help/evolution/es/figures/categories_a.png
-share/gnome/help/evolution/es/figures/collap_head_a.png
-share/gnome/help/evolution/es/figures/config-cal.png
-share/gnome/help/evolution/es/figures/config-mail.png
 share/gnome/help/evolution/es/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/es/figures/delgt-add.png
 share/gnome/help/evolution/es/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/es/figures/evo_account_editor_a.png
 share/gnome/help/evolution/es/figures/evo_adv_search_a.png
-share/gnome/help/evolution/es/figures/evo_allday_a.png
 share/gnome/help/evolution/es/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/es/figures/evo_backup.png
 share/gnome/help/evolution/es/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/es/figures/evo_backup_warning.png
 share/gnome/help/evolution/es/figures/evo_blink.png
-share/gnome/help/evolution/es/figures/evo_cal_a.png
-share/gnome/help/evolution/es/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/es/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/es/figures/evo_calstatus_a.png
 share/gnome/help/evolution/es/figures/evo_caltasks_a.png
 share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/es/figures/evo_crash_recovery.png
-share/gnome/help/evolution/es/figures/evo_custom_header.png
-share/gnome/help/evolution/es/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/es/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/es/figures/evo_dialog-info.png
 share/gnome/help/evolution/es/figures/evo_dialog-warning.png
-share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/es/figures/evo_edit_search.png
 share/gnome/help/evolution/es/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/es/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/es/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/es/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/es/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/es/figures/evo_identity_a.png
-share/gnome/help/evolution/es/figures/evo_identityedit_a.png
-share/gnome/help/evolution/es/figures/evo_imapheader_a.png
 share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/es/figures/evo_import.png
-share/gnome/help/evolution/es/figures/evo_import_asst_a.png
 share/gnome/help/evolution/es/figures/evo_junk_a.png
 share/gnome/help/evolution/es/figures/evo_label_a.png
 share/gnome/help/evolution/es/figures/evo_labels_a.png
@@ -1245,93 +1191,64 @@ share/gnome/help/evolution/es/figures/evo_mail_notifier.png
 share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/es/figures/evo_memo_a.png
-share/gnome/help/evolution/es/figures/evo_mereceive_a.png
-share/gnome/help/evolution/es/figures/evo_message_filters_a.png
 share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/es/figures/evo_newmail.png
 share/gnome/help/evolution/es/figures/evo_newmess_a.png
 share/gnome/help/evolution/es/figures/evo_offline.png
 share/gnome/help/evolution/es/figures/evo_popreceive_a.png
 share/gnome/help/evolution/es/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/es/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/es/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/es/figures/evo_rule_a.png
-share/gnome/help/evolution/es/figures/evo_select_add_folder.png
-share/gnome/help/evolution/es/figures/evo_select_folder.png
 share/gnome/help/evolution/es/figures/evo_send_option_a.png
 share/gnome/help/evolution/es/figures/evo_send_setup_a.png
 share/gnome/help/evolution/es/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/es/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/es/figures/evo_timezone_a.png
 share/gnome/help/evolution/es/figures/evo_usereceive_a.png
-share/gnome/help/evolution/es/figures/exchg-identity.png
-share/gnome/help/evolution/es/figures/exchng-identity.png
-share/gnome/help/evolution/es/figures/exchng-rec-mail.png
+share/gnome/help/evolution/es/figures/evolution_contact_preference.png
+share/gnome/help/evolution/es/figures/evolution_mail_preference.png
 share/gnome/help/evolution/es/figures/exchng-rec-mails.png
-share/gnome/help/evolution/es/figures/exchng-rec-option.png
 share/gnome/help/evolution/es/figures/exchng-rec-options.png
-share/gnome/help/evolution/es/figures/exchng-settings.png
 share/gnome/help/evolution/es/figures/filter-new-fig.png
-share/gnome/help/evolution/es/figures/free_busy.png
+share/gnome/help/evolution/es/figures/folder_plus.png
+share/gnome/help/evolution/es/figures/folder_size_mapi.png
+share/gnome/help/evolution/es/figures/folder_size_preference.png
 share/gnome/help/evolution/es/figures/google_cal_view.png
-share/gnome/help/evolution/es/figures/mail-threaded.png
+share/gnome/help/evolution/es/figures/groupwise_resend.png
+share/gnome/help/evolution/es/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/es/figures/local_ics_calendar.png
 share/gnome/help/evolution/es/figures/mailer_preferences.png
+share/gnome/help/evolution/es/figures/meeting.png
 share/gnome/help/evolution/es/figures/minus.png
 share/gnome/help/evolution/es/figures/plus.png
-share/gnome/help/evolution/es/figures/proxy-cal.png
-share/gnome/help/evolution/es/figures/proxy-login.png
 share/gnome/help/evolution/es/figures/quick_add_a.png
 share/gnome/help/evolution/es/figures/quick_reference.png
 share/gnome/help/evolution/es/figures/stock_search.png
-share/gnome/help/evolution/es/figures/sub-others-folder.png
-share/gnome/help/evolution/es/figures/sub-pub-fold.png
 share/gnome/help/evolution/es/figures/ver_view_a.png
 share/gnome/help/evolution/eu/evolution.xml
-share/gnome/help/evolution/eu/figures/account_editor_a.png
 share/gnome/help/evolution/eu/figures/attach_reminder_a.png
+share/gnome/help/evolution/eu/figures/calendar_preference_display.png
 share/gnome/help/evolution/eu/figures/categories_a.png
-share/gnome/help/evolution/eu/figures/collap_head_a.png
-share/gnome/help/evolution/eu/figures/config-cal.png
-share/gnome/help/evolution/eu/figures/config-mail.png
 share/gnome/help/evolution/eu/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/eu/figures/delgt-add.png
 share/gnome/help/evolution/eu/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/eu/figures/evo_account_editor_a.png
 share/gnome/help/evolution/eu/figures/evo_adv_search_a.png
-share/gnome/help/evolution/eu/figures/evo_allday_a.png
 share/gnome/help/evolution/eu/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/eu/figures/evo_backup.png
 share/gnome/help/evolution/eu/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/eu/figures/evo_backup_warning.png
 share/gnome/help/evolution/eu/figures/evo_blink.png
-share/gnome/help/evolution/eu/figures/evo_cal_a.png
-share/gnome/help/evolution/eu/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/eu/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/eu/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/eu/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/eu/figures/evo_calstatus_a.png
 share/gnome/help/evolution/eu/figures/evo_caltasks_a.png
 share/gnome/help/evolution/eu/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/eu/figures/evo_crash_recovery.png
-share/gnome/help/evolution/eu/figures/evo_custom_header.png
-share/gnome/help/evolution/eu/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/eu/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/eu/figures/evo_dialog-info.png
 share/gnome/help/evolution/eu/figures/evo_dialog-warning.png
-share/gnome/help/evolution/eu/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/eu/figures/evo_edit_search.png
 share/gnome/help/evolution/eu/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/eu/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/eu/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/eu/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/eu/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/eu/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/eu/figures/evo_identity_a.png
-share/gnome/help/evolution/eu/figures/evo_identityedit_a.png
-share/gnome/help/evolution/eu/figures/evo_imapheader_a.png
 share/gnome/help/evolution/eu/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/eu/figures/evo_import.png
-share/gnome/help/evolution/eu/figures/evo_import_asst_a.png
 share/gnome/help/evolution/eu/figures/evo_junk_a.png
 share/gnome/help/evolution/eu/figures/evo_label_a.png
 share/gnome/help/evolution/eu/figures/evo_labels_a.png
@@ -1341,93 +1258,64 @@ share/gnome/help/evolution/eu/figures/evo_mail_notifier.png
 share/gnome/help/evolution/eu/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_memo_a.png
-share/gnome/help/evolution/eu/figures/evo_mereceive_a.png
-share/gnome/help/evolution/eu/figures/evo_message_filters_a.png
 share/gnome/help/evolution/eu/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_newmail.png
 share/gnome/help/evolution/eu/figures/evo_newmess_a.png
 share/gnome/help/evolution/eu/figures/evo_offline.png
 share/gnome/help/evolution/eu/figures/evo_popreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/eu/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/eu/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/eu/figures/evo_rule_a.png
-share/gnome/help/evolution/eu/figures/evo_select_add_folder.png
-share/gnome/help/evolution/eu/figures/evo_select_folder.png
 share/gnome/help/evolution/eu/figures/evo_send_option_a.png
 share/gnome/help/evolution/eu/figures/evo_send_setup_a.png
 share/gnome/help/evolution/eu/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/eu/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/eu/figures/evo_timezone_a.png
 share/gnome/help/evolution/eu/figures/evo_usereceive_a.png
-share/gnome/help/evolution/eu/figures/exchg-identity.png
-share/gnome/help/evolution/eu/figures/exchng-identity.png
-share/gnome/help/evolution/eu/figures/exchng-rec-mail.png
+share/gnome/help/evolution/eu/figures/evolution_contact_preference.png
+share/gnome/help/evolution/eu/figures/evolution_mail_preference.png
 share/gnome/help/evolution/eu/figures/exchng-rec-mails.png
-share/gnome/help/evolution/eu/figures/exchng-rec-option.png
 share/gnome/help/evolution/eu/figures/exchng-rec-options.png
-share/gnome/help/evolution/eu/figures/exchng-settings.png
 share/gnome/help/evolution/eu/figures/filter-new-fig.png
-share/gnome/help/evolution/eu/figures/free_busy.png
+share/gnome/help/evolution/eu/figures/folder_plus.png
+share/gnome/help/evolution/eu/figures/folder_size_mapi.png
+share/gnome/help/evolution/eu/figures/folder_size_preference.png
 share/gnome/help/evolution/eu/figures/google_cal_view.png
-share/gnome/help/evolution/eu/figures/mail-threaded.png
+share/gnome/help/evolution/eu/figures/groupwise_resend.png
+share/gnome/help/evolution/eu/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/eu/figures/local_ics_calendar.png
 share/gnome/help/evolution/eu/figures/mailer_preferences.png
+share/gnome/help/evolution/eu/figures/meeting.png
 share/gnome/help/evolution/eu/figures/minus.png
 share/gnome/help/evolution/eu/figures/plus.png
-share/gnome/help/evolution/eu/figures/proxy-cal.png
-share/gnome/help/evolution/eu/figures/proxy-login.png
 share/gnome/help/evolution/eu/figures/quick_add_a.png
 share/gnome/help/evolution/eu/figures/quick_reference.png
 share/gnome/help/evolution/eu/figures/stock_search.png
-share/gnome/help/evolution/eu/figures/sub-others-folder.png
-share/gnome/help/evolution/eu/figures/sub-pub-fold.png
 share/gnome/help/evolution/eu/figures/ver_view_a.png
 share/gnome/help/evolution/fr/evolution.xml
-share/gnome/help/evolution/fr/figures/account_editor_a.png
 share/gnome/help/evolution/fr/figures/attach_reminder_a.png
+share/gnome/help/evolution/fr/figures/calendar_preference_display.png
 share/gnome/help/evolution/fr/figures/categories_a.png
-share/gnome/help/evolution/fr/figures/collap_head_a.png
-share/gnome/help/evolution/fr/figures/config-cal.png
-share/gnome/help/evolution/fr/figures/config-mail.png
 share/gnome/help/evolution/fr/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/fr/figures/delgt-add.png
 share/gnome/help/evolution/fr/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/fr/figures/evo_account_editor_a.png
 share/gnome/help/evolution/fr/figures/evo_adv_search_a.png
-share/gnome/help/evolution/fr/figures/evo_allday_a.png
 share/gnome/help/evolution/fr/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/fr/figures/evo_backup.png
 share/gnome/help/evolution/fr/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/fr/figures/evo_backup_warning.png
 share/gnome/help/evolution/fr/figures/evo_blink.png
-share/gnome/help/evolution/fr/figures/evo_cal_a.png
-share/gnome/help/evolution/fr/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/fr/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/fr/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/fr/figures/evo_calstatus_a.png
 share/gnome/help/evolution/fr/figures/evo_caltasks_a.png
 share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/fr/figures/evo_crash_recovery.png
-share/gnome/help/evolution/fr/figures/evo_custom_header.png
-share/gnome/help/evolution/fr/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/fr/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/fr/figures/evo_dialog-info.png
 share/gnome/help/evolution/fr/figures/evo_dialog-warning.png
-share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/fr/figures/evo_edit_search.png
 share/gnome/help/evolution/fr/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/fr/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/fr/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/fr/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/fr/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/fr/figures/evo_identity_a.png
-share/gnome/help/evolution/fr/figures/evo_identityedit_a.png
-share/gnome/help/evolution/fr/figures/evo_imapheader_a.png
 share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/fr/figures/evo_import.png
-share/gnome/help/evolution/fr/figures/evo_import_asst_a.png
 share/gnome/help/evolution/fr/figures/evo_junk_a.png
 share/gnome/help/evolution/fr/figures/evo_label_a.png
 share/gnome/help/evolution/fr/figures/evo_labels_a.png
@@ -1437,93 +1325,64 @@ share/gnome/help/evolution/fr/figures/evo_mail_notifier.png
 share/gnome/help/evolution/fr/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_memo_a.png
-share/gnome/help/evolution/fr/figures/evo_mereceive_a.png
-share/gnome/help/evolution/fr/figures/evo_message_filters_a.png
 share/gnome/help/evolution/fr/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_newmail.png
 share/gnome/help/evolution/fr/figures/evo_newmess_a.png
 share/gnome/help/evolution/fr/figures/evo_offline.png
 share/gnome/help/evolution/fr/figures/evo_popreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/fr/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/fr/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/fr/figures/evo_rule_a.png
-share/gnome/help/evolution/fr/figures/evo_select_add_folder.png
-share/gnome/help/evolution/fr/figures/evo_select_folder.png
 share/gnome/help/evolution/fr/figures/evo_send_option_a.png
 share/gnome/help/evolution/fr/figures/evo_send_setup_a.png
 share/gnome/help/evolution/fr/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/fr/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/fr/figures/evo_timezone_a.png
 share/gnome/help/evolution/fr/figures/evo_usereceive_a.png
-share/gnome/help/evolution/fr/figures/exchg-identity.png
-share/gnome/help/evolution/fr/figures/exchng-identity.png
-share/gnome/help/evolution/fr/figures/exchng-rec-mail.png
+share/gnome/help/evolution/fr/figures/evolution_contact_preference.png
+share/gnome/help/evolution/fr/figures/evolution_mail_preference.png
 share/gnome/help/evolution/fr/figures/exchng-rec-mails.png
-share/gnome/help/evolution/fr/figures/exchng-rec-option.png
 share/gnome/help/evolution/fr/figures/exchng-rec-options.png
-share/gnome/help/evolution/fr/figures/exchng-settings.png
 share/gnome/help/evolution/fr/figures/filter-new-fig.png
-share/gnome/help/evolution/fr/figures/free_busy.png
+share/gnome/help/evolution/fr/figures/folder_plus.png
+share/gnome/help/evolution/fr/figures/folder_size_mapi.png
+share/gnome/help/evolution/fr/figures/folder_size_preference.png
 share/gnome/help/evolution/fr/figures/google_cal_view.png
-share/gnome/help/evolution/fr/figures/mail-threaded.png
+share/gnome/help/evolution/fr/figures/groupwise_resend.png
+share/gnome/help/evolution/fr/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/fr/figures/local_ics_calendar.png
 share/gnome/help/evolution/fr/figures/mailer_preferences.png
+share/gnome/help/evolution/fr/figures/meeting.png
 share/gnome/help/evolution/fr/figures/minus.png
 share/gnome/help/evolution/fr/figures/plus.png
-share/gnome/help/evolution/fr/figures/proxy-cal.png
-share/gnome/help/evolution/fr/figures/proxy-login.png
 share/gnome/help/evolution/fr/figures/quick_add_a.png
 share/gnome/help/evolution/fr/figures/quick_reference.png
 share/gnome/help/evolution/fr/figures/stock_search.png
-share/gnome/help/evolution/fr/figures/sub-others-folder.png
-share/gnome/help/evolution/fr/figures/sub-pub-fold.png
 share/gnome/help/evolution/fr/figures/ver_view_a.png
 share/gnome/help/evolution/mk/evolution.xml
-share/gnome/help/evolution/mk/figures/account_editor_a.png
 share/gnome/help/evolution/mk/figures/attach_reminder_a.png
+share/gnome/help/evolution/mk/figures/calendar_preference_display.png
 share/gnome/help/evolution/mk/figures/categories_a.png
-share/gnome/help/evolution/mk/figures/collap_head_a.png
-share/gnome/help/evolution/mk/figures/config-cal.png
-share/gnome/help/evolution/mk/figures/config-mail.png
 share/gnome/help/evolution/mk/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/mk/figures/delgt-add.png
 share/gnome/help/evolution/mk/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/mk/figures/evo_account_editor_a.png
 share/gnome/help/evolution/mk/figures/evo_adv_search_a.png
-share/gnome/help/evolution/mk/figures/evo_allday_a.png
 share/gnome/help/evolution/mk/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/mk/figures/evo_backup.png
 share/gnome/help/evolution/mk/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/mk/figures/evo_backup_warning.png
 share/gnome/help/evolution/mk/figures/evo_blink.png
-share/gnome/help/evolution/mk/figures/evo_cal_a.png
-share/gnome/help/evolution/mk/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/mk/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/mk/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/mk/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/mk/figures/evo_calstatus_a.png
 share/gnome/help/evolution/mk/figures/evo_caltasks_a.png
 share/gnome/help/evolution/mk/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/mk/figures/evo_crash_recovery.png
-share/gnome/help/evolution/mk/figures/evo_custom_header.png
-share/gnome/help/evolution/mk/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/mk/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/mk/figures/evo_dialog-info.png
 share/gnome/help/evolution/mk/figures/evo_dialog-warning.png
-share/gnome/help/evolution/mk/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/mk/figures/evo_edit_search.png
 share/gnome/help/evolution/mk/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/mk/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/mk/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/mk/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/mk/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/mk/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/mk/figures/evo_identity_a.png
-share/gnome/help/evolution/mk/figures/evo_identityedit_a.png
-share/gnome/help/evolution/mk/figures/evo_imapheader_a.png
 share/gnome/help/evolution/mk/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/mk/figures/evo_import.png
-share/gnome/help/evolution/mk/figures/evo_import_asst_a.png
 share/gnome/help/evolution/mk/figures/evo_junk_a.png
 share/gnome/help/evolution/mk/figures/evo_label_a.png
 share/gnome/help/evolution/mk/figures/evo_labels_a.png
@@ -1533,93 +1392,64 @@ share/gnome/help/evolution/mk/figures/evo_mail_notifier.png
 share/gnome/help/evolution/mk/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_memo_a.png
-share/gnome/help/evolution/mk/figures/evo_mereceive_a.png
-share/gnome/help/evolution/mk/figures/evo_message_filters_a.png
 share/gnome/help/evolution/mk/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_newmail.png
 share/gnome/help/evolution/mk/figures/evo_newmess_a.png
 share/gnome/help/evolution/mk/figures/evo_offline.png
 share/gnome/help/evolution/mk/figures/evo_popreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/mk/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/mk/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/mk/figures/evo_rule_a.png
-share/gnome/help/evolution/mk/figures/evo_select_add_folder.png
-share/gnome/help/evolution/mk/figures/evo_select_folder.png
 share/gnome/help/evolution/mk/figures/evo_send_option_a.png
 share/gnome/help/evolution/mk/figures/evo_send_setup_a.png
 share/gnome/help/evolution/mk/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/mk/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/mk/figures/evo_timezone_a.png
 share/gnome/help/evolution/mk/figures/evo_usereceive_a.png
-share/gnome/help/evolution/mk/figures/exchg-identity.png
-share/gnome/help/evolution/mk/figures/exchng-identity.png
-share/gnome/help/evolution/mk/figures/exchng-rec-mail.png
+share/gnome/help/evolution/mk/figures/evolution_contact_preference.png
+share/gnome/help/evolution/mk/figures/evolution_mail_preference.png
 share/gnome/help/evolution/mk/figures/exchng-rec-mails.png
-share/gnome/help/evolution/mk/figures/exchng-rec-option.png
 share/gnome/help/evolution/mk/figures/exchng-rec-options.png
-share/gnome/help/evolution/mk/figures/exchng-settings.png
 share/gnome/help/evolution/mk/figures/filter-new-fig.png
-share/gnome/help/evolution/mk/figures/free_busy.png
+share/gnome/help/evolution/mk/figures/folder_plus.png
+share/gnome/help/evolution/mk/figures/folder_size_mapi.png
+share/gnome/help/evolution/mk/figures/folder_size_preference.png
 share/gnome/help/evolution/mk/figures/google_cal_view.png
-share/gnome/help/evolution/mk/figures/mail-threaded.png
+share/gnome/help/evolution/mk/figures/groupwise_resend.png
+share/gnome/help/evolution/mk/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/mk/figures/local_ics_calendar.png
 share/gnome/help/evolution/mk/figures/mailer_preferences.png
+share/gnome/help/evolution/mk/figures/meeting.png
 share/gnome/help/evolution/mk/figures/minus.png
 share/gnome/help/evolution/mk/figures/plus.png
-share/gnome/help/evolution/mk/figures/proxy-cal.png
-share/gnome/help/evolution/mk/figures/proxy-login.png
 share/gnome/help/evolution/mk/figures/quick_add_a.png
 share/gnome/help/evolution/mk/figures/quick_reference.png
 share/gnome/help/evolution/mk/figures/stock_search.png
-share/gnome/help/evolution/mk/figures/sub-others-folder.png
-share/gnome/help/evolution/mk/figures/sub-pub-fold.png
 share/gnome/help/evolution/mk/figures/ver_view_a.png
 share/gnome/help/evolution/oc/evolution.xml
-share/gnome/help/evolution/oc/figures/account_editor_a.png
 share/gnome/help/evolution/oc/figures/attach_reminder_a.png
+share/gnome/help/evolution/oc/figures/calendar_preference_display.png
 share/gnome/help/evolution/oc/figures/categories_a.png
-share/gnome/help/evolution/oc/figures/collap_head_a.png
-share/gnome/help/evolution/oc/figures/config-cal.png
-share/gnome/help/evolution/oc/figures/config-mail.png
 share/gnome/help/evolution/oc/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/oc/figures/delgt-add.png
 share/gnome/help/evolution/oc/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/oc/figures/evo_account_editor_a.png
 share/gnome/help/evolution/oc/figures/evo_adv_search_a.png
-share/gnome/help/evolution/oc/figures/evo_allday_a.png
 share/gnome/help/evolution/oc/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/oc/figures/evo_backup.png
 share/gnome/help/evolution/oc/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/oc/figures/evo_backup_warning.png
 share/gnome/help/evolution/oc/figures/evo_blink.png
-share/gnome/help/evolution/oc/figures/evo_cal_a.png
-share/gnome/help/evolution/oc/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/oc/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/oc/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/oc/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/oc/figures/evo_calstatus_a.png
 share/gnome/help/evolution/oc/figures/evo_caltasks_a.png
 share/gnome/help/evolution/oc/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/oc/figures/evo_crash_recovery.png
-share/gnome/help/evolution/oc/figures/evo_custom_header.png
-share/gnome/help/evolution/oc/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/oc/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/oc/figures/evo_dialog-info.png
 share/gnome/help/evolution/oc/figures/evo_dialog-warning.png
-share/gnome/help/evolution/oc/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/oc/figures/evo_edit_search.png
 share/gnome/help/evolution/oc/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/oc/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/oc/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/oc/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/oc/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/oc/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/oc/figures/evo_identity_a.png
-share/gnome/help/evolution/oc/figures/evo_identityedit_a.png
-share/gnome/help/evolution/oc/figures/evo_imapheader_a.png
 share/gnome/help/evolution/oc/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/oc/figures/evo_import.png
-share/gnome/help/evolution/oc/figures/evo_import_asst_a.png
 share/gnome/help/evolution/oc/figures/evo_junk_a.png
 share/gnome/help/evolution/oc/figures/evo_label_a.png
 share/gnome/help/evolution/oc/figures/evo_labels_a.png
@@ -1629,93 +1459,64 @@ share/gnome/help/evolution/oc/figures/evo_mail_notifier.png
 share/gnome/help/evolution/oc/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_memo_a.png
-share/gnome/help/evolution/oc/figures/evo_mereceive_a.png
-share/gnome/help/evolution/oc/figures/evo_message_filters_a.png
 share/gnome/help/evolution/oc/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_newmail.png
 share/gnome/help/evolution/oc/figures/evo_newmess_a.png
 share/gnome/help/evolution/oc/figures/evo_offline.png
 share/gnome/help/evolution/oc/figures/evo_popreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/oc/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/oc/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/oc/figures/evo_rule_a.png
-share/gnome/help/evolution/oc/figures/evo_select_add_folder.png
-share/gnome/help/evolution/oc/figures/evo_select_folder.png
 share/gnome/help/evolution/oc/figures/evo_send_option_a.png
 share/gnome/help/evolution/oc/figures/evo_send_setup_a.png
 share/gnome/help/evolution/oc/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/oc/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/oc/figures/evo_timezone_a.png
 share/gnome/help/evolution/oc/figures/evo_usereceive_a.png
-share/gnome/help/evolution/oc/figures/exchg-identity.png
-share/gnome/help/evolution/oc/figures/exchng-identity.png
-share/gnome/help/evolution/oc/figures/exchng-rec-mail.png
+share/gnome/help/evolution/oc/figures/evolution_contact_preference.png
+share/gnome/help/evolution/oc/figures/evolution_mail_preference.png
 share/gnome/help/evolution/oc/figures/exchng-rec-mails.png
-share/gnome/help/evolution/oc/figures/exchng-rec-option.png
 share/gnome/help/evolution/oc/figures/exchng-rec-options.png
-share/gnome/help/evolution/oc/figures/exchng-settings.png
 share/gnome/help/evolution/oc/figures/filter-new-fig.png
-share/gnome/help/evolution/oc/figures/free_busy.png
+share/gnome/help/evolution/oc/figures/folder_plus.png
+share/gnome/help/evolution/oc/figures/folder_size_mapi.png
+share/gnome/help/evolution/oc/figures/folder_size_preference.png
 share/gnome/help/evolution/oc/figures/google_cal_view.png
-share/gnome/help/evolution/oc/figures/mail-threaded.png
+share/gnome/help/evolution/oc/figures/groupwise_resend.png
+share/gnome/help/evolution/oc/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/oc/figures/local_ics_calendar.png
 share/gnome/help/evolution/oc/figures/mailer_preferences.png
+share/gnome/help/evolution/oc/figures/meeting.png
 share/gnome/help/evolution/oc/figures/minus.png
 share/gnome/help/evolution/oc/figures/plus.png
-share/gnome/help/evolution/oc/figures/proxy-cal.png
-share/gnome/help/evolution/oc/figures/proxy-login.png
 share/gnome/help/evolution/oc/figures/quick_add_a.png
 share/gnome/help/evolution/oc/figures/quick_reference.png
 share/gnome/help/evolution/oc/figures/stock_search.png
-share/gnome/help/evolution/oc/figures/sub-others-folder.png
-share/gnome/help/evolution/oc/figures/sub-pub-fold.png
 share/gnome/help/evolution/oc/figures/ver_view_a.png
 share/gnome/help/evolution/ru/evolution.xml
-share/gnome/help/evolution/ru/figures/account_editor_a.png
 share/gnome/help/evolution/ru/figures/attach_reminder_a.png
+share/gnome/help/evolution/ru/figures/calendar_preference_display.png
 share/gnome/help/evolution/ru/figures/categories_a.png
-share/gnome/help/evolution/ru/figures/collap_head_a.png
-share/gnome/help/evolution/ru/figures/config-cal.png
-share/gnome/help/evolution/ru/figures/config-mail.png
 share/gnome/help/evolution/ru/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/ru/figures/delgt-add.png
 share/gnome/help/evolution/ru/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/ru/figures/evo_account_editor_a.png
 share/gnome/help/evolution/ru/figures/evo_adv_search_a.png
-share/gnome/help/evolution/ru/figures/evo_allday_a.png
 share/gnome/help/evolution/ru/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/ru/figures/evo_backup.png
 share/gnome/help/evolution/ru/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/ru/figures/evo_backup_warning.png
 share/gnome/help/evolution/ru/figures/evo_blink.png
-share/gnome/help/evolution/ru/figures/evo_cal_a.png
-share/gnome/help/evolution/ru/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/ru/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/ru/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/ru/figures/evo_calstatus_a.png
 share/gnome/help/evolution/ru/figures/evo_caltasks_a.png
 share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/ru/figures/evo_crash_recovery.png
-share/gnome/help/evolution/ru/figures/evo_custom_header.png
-share/gnome/help/evolution/ru/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/ru/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/ru/figures/evo_dialog-info.png
 share/gnome/help/evolution/ru/figures/evo_dialog-warning.png
-share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/ru/figures/evo_edit_search.png
 share/gnome/help/evolution/ru/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/ru/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/ru/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/ru/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/ru/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/ru/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/ru/figures/evo_identity_a.png
-share/gnome/help/evolution/ru/figures/evo_identityedit_a.png
-share/gnome/help/evolution/ru/figures/evo_imapheader_a.png
 share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/ru/figures/evo_import.png
-share/gnome/help/evolution/ru/figures/evo_import_asst_a.png
 share/gnome/help/evolution/ru/figures/evo_junk_a.png
 share/gnome/help/evolution/ru/figures/evo_label_a.png
 share/gnome/help/evolution/ru/figures/evo_labels_a.png
@@ -1725,93 +1526,64 @@ share/gnome/help/evolution/ru/figures/evo_mail_notifier.png
 share/gnome/help/evolution/ru/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_memo_a.png
-share/gnome/help/evolution/ru/figures/evo_mereceive_a.png
-share/gnome/help/evolution/ru/figures/evo_message_filters_a.png
 share/gnome/help/evolution/ru/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_newmail.png
 share/gnome/help/evolution/ru/figures/evo_newmess_a.png
 share/gnome/help/evolution/ru/figures/evo_offline.png
 share/gnome/help/evolution/ru/figures/evo_popreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/ru/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/ru/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/ru/figures/evo_rule_a.png
-share/gnome/help/evolution/ru/figures/evo_select_add_folder.png
-share/gnome/help/evolution/ru/figures/evo_select_folder.png
 share/gnome/help/evolution/ru/figures/evo_send_option_a.png
 share/gnome/help/evolution/ru/figures/evo_send_setup_a.png
 share/gnome/help/evolution/ru/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/ru/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/ru/figures/evo_timezone_a.png
 share/gnome/help/evolution/ru/figures/evo_usereceive_a.png
-share/gnome/help/evolution/ru/figures/exchg-identity.png
-share/gnome/help/evolution/ru/figures/exchng-identity.png
-share/gnome/help/evolution/ru/figures/exchng-rec-mail.png
+share/gnome/help/evolution/ru/figures/evolution_contact_preference.png
+share/gnome/help/evolution/ru/figures/evolution_mail_preference.png
 share/gnome/help/evolution/ru/figures/exchng-rec-mails.png
-share/gnome/help/evolution/ru/figures/exchng-rec-option.png
 share/gnome/help/evolution/ru/figures/exchng-rec-options.png
-share/gnome/help/evolution/ru/figures/exchng-settings.png
 share/gnome/help/evolution/ru/figures/filter-new-fig.png
-share/gnome/help/evolution/ru/figures/free_busy.png
+share/gnome/help/evolution/ru/figures/folder_plus.png
+share/gnome/help/evolution/ru/figures/folder_size_mapi.png
+share/gnome/help/evolution/ru/figures/folder_size_preference.png
 share/gnome/help/evolution/ru/figures/google_cal_view.png
-share/gnome/help/evolution/ru/figures/mail-threaded.png
+share/gnome/help/evolution/ru/figures/groupwise_resend.png
+share/gnome/help/evolution/ru/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/ru/figures/local_ics_calendar.png
 share/gnome/help/evolution/ru/figures/mailer_preferences.png
+share/gnome/help/evolution/ru/figures/meeting.png
 share/gnome/help/evolution/ru/figures/minus.png
 share/gnome/help/evolution/ru/figures/plus.png
-share/gnome/help/evolution/ru/figures/proxy-cal.png
-share/gnome/help/evolution/ru/figures/proxy-login.png
 share/gnome/help/evolution/ru/figures/quick_add_a.png
 share/gnome/help/evolution/ru/figures/quick_reference.png
 share/gnome/help/evolution/ru/figures/stock_search.png
-share/gnome/help/evolution/ru/figures/sub-others-folder.png
-share/gnome/help/evolution/ru/figures/sub-pub-fold.png
 share/gnome/help/evolution/ru/figures/ver_view_a.png
 share/gnome/help/evolution/sv/evolution.xml
-share/gnome/help/evolution/sv/figures/account_editor_a.png
 share/gnome/help/evolution/sv/figures/attach_reminder_a.png
+share/gnome/help/evolution/sv/figures/calendar_preference_display.png
 share/gnome/help/evolution/sv/figures/categories_a.png
-share/gnome/help/evolution/sv/figures/collap_head_a.png
-share/gnome/help/evolution/sv/figures/config-cal.png
-share/gnome/help/evolution/sv/figures/config-mail.png
 share/gnome/help/evolution/sv/figures/contacts_mainwindow_a.png
 share/gnome/help/evolution/sv/figures/delgt-add.png
 share/gnome/help/evolution/sv/figures/evo_Wcal_prop_a.png
-share/gnome/help/evolution/sv/figures/evo_account_editor_a.png
 share/gnome/help/evolution/sv/figures/evo_adv_search_a.png
-share/gnome/help/evolution/sv/figures/evo_allday_a.png
 share/gnome/help/evolution/sv/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/sv/figures/evo_backup.png
 share/gnome/help/evolution/sv/figures/evo_backup_prgsbar.png
 share/gnome/help/evolution/sv/figures/evo_backup_warning.png
 share/gnome/help/evolution/sv/figures/evo_blink.png
-share/gnome/help/evolution/sv/figures/evo_cal_a.png
-share/gnome/help/evolution/sv/figures/evo_cal_advsearch.png
 share/gnome/help/evolution/sv/figures/evo_cal_callout_a.png
-share/gnome/help/evolution/sv/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/sv/figures/evo_calstatus_a.png
 share/gnome/help/evolution/sv/figures/evo_caltasks_a.png
 share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
-share/gnome/help/evolution/sv/figures/evo_crash_recovery.png
-share/gnome/help/evolution/sv/figures/evo_custom_header.png
-share/gnome/help/evolution/sv/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/sv/figures/evo_delegate_permission_a.png
 share/gnome/help/evolution/sv/figures/evo_dialog-info.png
 share/gnome/help/evolution/sv/figures/evo_dialog-warning.png
-share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/sv/figures/evo_edit_search.png
 share/gnome/help/evolution/sv/figures/evo_exchng_mapi.png
 share/gnome/help/evolution/sv/figures/evo_flag_follow_up_a.png
 share/gnome/help/evolution/sv/figures/evo_gwreceive_a.png
-share/gnome/help/evolution/sv/figures/evo_gwreceiveedit_a.png
-share/gnome/help/evolution/sv/figures/evo_gwreceiveoptedit_a.png
 share/gnome/help/evolution/sv/figures/evo_gwstatustrack.png
-share/gnome/help/evolution/sv/figures/evo_identity_a.png
-share/gnome/help/evolution/sv/figures/evo_identityedit_a.png
-share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
 share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
-share/gnome/help/evolution/sv/figures/evo_import.png
-share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
 share/gnome/help/evolution/sv/figures/evo_junk_a.png
 share/gnome/help/evolution/sv/figures/evo_label_a.png
 share/gnome/help/evolution/sv/figures/evo_labels_a.png
@@ -1821,46 +1593,37 @@ share/gnome/help/evolution/sv/figures/evo_mail_notifier.png
 share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_memo_a.png
-share/gnome/help/evolution/sv/figures/evo_mereceive_a.png
-share/gnome/help/evolution/sv/figures/evo_message_filters_a.png
 share/gnome/help/evolution/sv/figures/evo_mhreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_newmail.png
 share/gnome/help/evolution/sv/figures/evo_newmess_a.png
 share/gnome/help/evolution/sv/figures/evo_offline.png
 share/gnome/help/evolution/sv/figures/evo_popreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/sv/figures/evo_receive_setup_a.png
-share/gnome/help/evolution/sv/figures/evo_rmdrnotes_a.png
 share/gnome/help/evolution/sv/figures/evo_rule_a.png
-share/gnome/help/evolution/sv/figures/evo_select_add_folder.png
-share/gnome/help/evolution/sv/figures/evo_select_folder.png
 share/gnome/help/evolution/sv/figures/evo_send_option_a.png
 share/gnome/help/evolution/sv/figures/evo_send_setup_a.png
 share/gnome/help/evolution/sv/figures/evo_sendstatus_a.png
 share/gnome/help/evolution/sv/figures/evo_shd_memo_a.png
-share/gnome/help/evolution/sv/figures/evo_timezone_a.png
 share/gnome/help/evolution/sv/figures/evo_usereceive_a.png
-share/gnome/help/evolution/sv/figures/exchg-identity.png
-share/gnome/help/evolution/sv/figures/exchng-identity.png
-share/gnome/help/evolution/sv/figures/exchng-rec-mail.png
+share/gnome/help/evolution/sv/figures/evolution_contact_preference.png
+share/gnome/help/evolution/sv/figures/evolution_mail_preference.png
 share/gnome/help/evolution/sv/figures/exchng-rec-mails.png
-share/gnome/help/evolution/sv/figures/exchng-rec-option.png
 share/gnome/help/evolution/sv/figures/exchng-rec-options.png
-share/gnome/help/evolution/sv/figures/exchng-settings.png
 share/gnome/help/evolution/sv/figures/filter-new-fig.png
-share/gnome/help/evolution/sv/figures/free_busy.png
+share/gnome/help/evolution/sv/figures/folder_plus.png
+share/gnome/help/evolution/sv/figures/folder_size_mapi.png
+share/gnome/help/evolution/sv/figures/folder_size_preference.png
 share/gnome/help/evolution/sv/figures/google_cal_view.png
-share/gnome/help/evolution/sv/figures/mail-threaded.png
+share/gnome/help/evolution/sv/figures/groupwise_resend.png
+share/gnome/help/evolution/sv/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/sv/figures/local_ics_calendar.png
 share/gnome/help/evolution/sv/figures/mailer_preferences.png
+share/gnome/help/evolution/sv/figures/meeting.png
 share/gnome/help/evolution/sv/figures/minus.png
 share/gnome/help/evolution/sv/figures/plus.png
-share/gnome/help/evolution/sv/figures/proxy-cal.png
-share/gnome/help/evolution/sv/figures/proxy-login.png
 share/gnome/help/evolution/sv/figures/quick_add_a.png
 share/gnome/help/evolution/sv/figures/quick_reference.png
 share/gnome/help/evolution/sv/figures/stock_search.png
-share/gnome/help/evolution/sv/figures/sub-others-folder.png
-share/gnome/help/evolution/sv/figures/sub-pub-fold.png
 share/gnome/help/evolution/sv/figures/ver_view_a.png
 share/icons/hicolor/16x16/apps/evolution-mail.png
 share/icons/hicolor/16x16/apps/evolution-memos.png
@@ -1902,6 +1665,7 @@ share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -2040,6 +1804,7 @@ share/omf/evolution/evolution-sv.omf
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/status
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions
@@ -2076,6 +1841,9 @@ share/omf/evolution/evolution-sv.omf
 @dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail/local
 @dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail
 @dirrm %%DATADIR%%/%%VERSION%%/default/sr
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro
 @dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail/local
 @dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail
 @dirrm %%DATADIR%%/%%VERSION%%/default/pt
@@ -2140,6 +1908,7 @@ share/omf/evolution/evolution-sv.omf
 @dirrm include/evolution-%%VERSION%%/misc
 @dirrm include/evolution-%%VERSION%%/menus
 @dirrm include/evolution-%%VERSION%%/mail
+@dirrm include/evolution-%%VERSION%%/filter
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/composer
@@ -2174,6 +1943,8 @@ share/omf/evolution/evolution-sv.omf
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
new file mode 100644
index 000000000000..dbe082a80c0b
--- /dev/null
+++ b/mail/libmapi/Makefile
@@ -0,0 +1,76 @@
+# New ports collection makefile for:   libmapi
+# Date created:			1 May 2009
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libmapi
+PORTVERSION=	0.8.2
+CATEGORIES=	mail
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=openchange/libmapi/${PORTNAME}-${PORTVERSION}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${CODENAME}
+
+MAINTAINER=	kwm@FreeBSD.org
+COMMENT=	Open Source implementation of Microsoft Exchange protocols
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		${HOSTCONFIG}:${PORTSDIR}/net/samba4-devel \
+		pidl:${PORTSDIR}/devel/p5-Parse-Pidl
+LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+		ical.43:${PORTSDIR}/devel/libical \
+		tdb.1:${PORTSDIR}/databases/tdb \
+		talloc.1:${PORTSDIR}/devel/talloc
+RUN_DEPENDS=	${HOSTCONFIG}:${PORTSDIR}/net/samba4-devel
+
+HOSTCONFIG=	${LOCALBASE}/libdata/pkgconfig/samba-hostconfig.pc
+
+CODENAME=	ROMULUS
+USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
+USE_PYTHON=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-samba=${LOCALBASE}
+
+OPTIONS=	BOOST "Enable libmapi++ (needs boost)" yes \
+		DOXYGEN "Enble building documentation" no
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+=	--disable-swig-perl
+CONFIGURE_ARGS+=	--disable-pymapi
+
+.if exists(${LOCALBASE}/lib/libboost_thread.so)
+WITH_BOOST=yes
+.endif
+
+.if defined(WITH_BOOST)
+LIB_DEPENDS+=	boost_thread.4:${PORTSDIR}/devel/boost-libs
+PLIST_SUB+=	BOOST=""
+.else
+PLIST_SUB+=	BOOST="@comment "
+.endif
+
+.if defined(WITH_DOXYGEN) || exists(${LOCALBASE}/bin/doxygen)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PLIST_SUB+=	DOXYGEN=""
+.else
+PLIST_SUB+=	DOXYGEN="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/sh|${LOCALBASE}/bin/bash|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile
+
+post-install:
+.for i in libmapi libmapiadmin libmapiproxy libmapiserver libmapistore libocpf
+	@${LN} -fs ${PREFIX}/lib/${i}.so.0.8 ${PREFIX}/lib/${i}.so.0
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/mail/libmapi/distinfo b/mail/libmapi/distinfo
new file mode 100644
index 000000000000..abf1d13dd538
--- /dev/null
+++ b/mail/libmapi/distinfo
@@ -0,0 +1,3 @@
+MD5 (libmapi-0.8.2-ROMULUS.tar.gz) = b956870860cd786a0793bd89783df185
+SHA256 (libmapi-0.8.2-ROMULUS.tar.gz) = 82dfe90fdc5ba0b34950719ea0ea9cc1cf7835bd1a9127fd177435e1eeba0ffa
+SIZE (libmapi-0.8.2-ROMULUS.tar.gz) = 1529269
diff --git a/mail/libmapi/pkg-descr b/mail/libmapi/pkg-descr
new file mode 100644
index 000000000000..2f78882e5b79
--- /dev/null
+++ b/mail/libmapi/pkg-descr
@@ -0,0 +1,12 @@
+The OpenChange MAPI library aims to provide interoperability with an 
+Open Source implementation of Microsoft Exchange protocols under UNIX/Linux.
+The current implementation offers a client-side library which can be used in
+existing messaging clients and offer native compatibility with Exchange Servers
+up to 2007.
+
+MAPI stands for Messaging Application Programming Interface and is used in the
+Microsoft Exchange Server groupware server. This solution works with Outlook
+and provides collaborative features such as a messaging server, shared 
+calendars, contact databases, public folders and tasks.
+
+WWW: http://www.openchange.org
diff --git a/mail/libmapi/pkg-plist b/mail/libmapi/pkg-plist
new file mode 100644
index 000000000000..7bac15f50679
--- /dev/null
+++ b/mail/libmapi/pkg-plist
@@ -0,0 +1,119 @@
+bin/exchange2ical
+bin/exchange2mbox
+bin/locale_codepage
+bin/mapiprofile
+bin/mapitest
+bin/openchangeclient
+bin/openchangemapidump
+bin/openchangepfadmin
+bin/schemaIDGUID
+include/gen_ndr/exchange.h
+include/gen_ndr/property.h
+%%BOOST%%include/libmapi++/attachment.h
+%%BOOST%%include/libmapi++/clibmapi.h
+%%BOOST%%include/libmapi++/folder.h
+%%BOOST%%include/libmapi++/impl/message.ipp
+%%BOOST%%include/libmapi++/impl/object.ipp
+%%BOOST%%include/libmapi++/impl/session.ipp
+%%BOOST%%include/libmapi++/libmapi++.h
+%%BOOST%%include/libmapi++/mapi_exception.h
+%%BOOST%%include/libmapi++/message.h
+%%BOOST%%include/libmapi++/message_store.h
+%%BOOST%%include/libmapi++/object.h
+%%BOOST%%include/libmapi++/profile.h
+%%BOOST%%include/libmapi++/property_container.h
+%%BOOST%%include/libmapi++/session.h
+include/libmapi/dlinklist.h
+include/libmapi/emsmdb.h
+include/libmapi/libmapi.h
+include/libmapi/mapi_ctx.h
+include/libmapi/mapi_id_array.h
+include/libmapi/mapi_nameid.h
+include/libmapi/mapi_notification.h
+include/libmapi/mapi_object.h
+include/libmapi/mapi_profile.h
+include/libmapi/mapi_provider.h
+include/libmapi/mapicode.h
+include/libmapi/mapidefs.h
+include/libmapi/nspi.h
+include/libmapi/proto.h
+include/libmapi/socket/netif.h
+include/libmapi/version.h
+include/libmapiadmin/libmapiadmin.h
+include/libmapiadmin/proto.h
+include/libmapiproxy.h
+include/libmapiserver.h
+include/libocpf/ocpf.h
+include/libocpf/proto.h
+include/mapistore/mapistore.h
+include/mapistore/mapistore_errors.h
+lib/libmapi.so
+lib/libmapi.so.0
+lib/libmapi.so.0.8
+lib/libmapiadmin.so
+lib/libmapiadmin.so.0
+lib/libmapiadmin.so.0.8
+lib/libmapiproxy.so
+lib/libmapiproxy.so.0
+lib/libmapiproxy.so.0.8
+lib/libmapiserver.so
+lib/libmapiserver.so.0
+lib/libmapiserver.so.0.8
+lib/libmapistore.so
+lib/libmapistore.so.0
+lib/libmapistore.so.0.8
+lib/libocpf.so
+lib/libocpf.so.0
+lib/libocpf.so.0.8
+lib/mapistore_backends/mapistore_sqlite3.so
+lib/nagios/check_exchange
+libdata/pkgconfig/libmapi.pc
+libdata/pkgconfig/libmapiadmin.pc
+libdata/pkgconfig/libmapiproxy.pc
+libdata/pkgconfig/libmapiserver.pc
+libdata/pkgconfig/libocpf.pc
+%%PYTHON_SITELIBDIR%%/openchange/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/mailbox.py
+%%PYTHON_SITELIBDIR%%/openchange/provision.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/test_mailbox.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/test_provision.py
+modules/dcerpc_mapiproxy/mpm_cache.so
+modules/dcerpc_mapiproxy/mpm_downgrade.so
+modules/dcerpc_mapiproxy/mpm_dummy.so
+modules/dcerpc_mapiproxy/mpm_pack.so
+modules/dcerpc_mapiproxy_server/exchange_ds_rfr.so
+modules/dcerpc_mapiproxy_server/exchange_emsmdb.so
+modules/dcerpc_mapiproxy_server/exchange_nsp.so
+modules/dcerpc_server/dcesrv_mapiproxy.so
+modules/torture/openchange.so
+share/setup/AD/oc_provision_configuration.ldif
+share/setup/AD/oc_provision_schema.ldif
+share/setup/AD/oc_provision_schema_ADSC.ldif
+share/setup/AD/oc_provision_schema_modify.ldif
+share/setup/AD/prefixMap.txt
+share/setup/openchangedb/oc_provision_openchange_init.ldif
+share/setup/openchangedb/oc_provision_openchange_mailbox.ldif
+share/setup/profiles/oc_profiles_init.ldif
+share/setup/profiles/oc_profiles_schema.ldif
+@dirrm share/setup/profiles
+@dirrm share/setup/openchangedb
+@dirrm share/setup/AD
+@dirrm share/setup
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/tests
+@dirrm %%PYTHON_SITELIBDIR%%/openchange
+@dirrm modules/torture
+@dirrm modules/dcerpc_server
+@dirrm modules/dcerpc_mapiproxy_server
+@dirrm modules/dcerpc_mapiproxy
+@dirrmtry modules
+@dirrm lib/nagios
+@dirrm lib/mapistore_backends
+@dirrm include/mapistore
+@dirrm include/libocpf
+@dirrm include/libmapiadmin
+@dirrm include/libmapi/socket
+@dirrm include/libmapi
+%%BOOST%%@dirrm include/libmapi++/impl
+%%BOOST%%@dirrm include/libmapi++
+@dirrm include/gen_ndr