Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 752 insertions, 761 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 255935d6e..bf433a61c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	evolution
-PORTVERSION=	3.6.4
+PORTVERSION=	3.12.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,24 +11,25 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		highlight:${PORTSDIR}/textproc/highlight
 LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
 		libgcr-3.so:${PORTSDIR}/security/gcr \
+		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
+		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
 		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libnotify.so:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	highlight:${PORTSDIR}/textproc/highlight
 
-USE_XZ=		yes
-USES=		desktop-file-utils bison gettext gmake pathfix pkgconfig \
-		shebangfix
-USE_GNOME=	gnomeprefix intlhack evolutiondataserver3 gtkhtml4 \
-		gnomedocutils ltasneededhack gnomedesktop3
-USE_AUTOTOOLS=	libtool
+USES=		desktop-file-utils bison gettext gmake libtool \
+		pathfix pkgconfig shebangfix tar:xz
+USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomeprefix gtkhtml4 \
+		intlhack
+GNU_CONFIGURE=	yes
 USE_GSTREAMER1=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-sub-version=" FreeBSD GNOME Team Port"
 # gtkimageview needs to get a gtk3 release first.
@@ -56,81 +57,51 @@ GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
 		org.gnome.evolution.plugin.templates.gschema.xml
 
-EVO_VERSION=	3.6
+EVO_VERSION=	3.12
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
-OPTIONS_DEFINE=	LDAP WEATHER CANBERRA SPAMASSASSIN PST
+OPTIONS_DEFINE=	LDAP WEATHER CANBERRA PST
 OPTIONS_DEFAULT=LDAP WEATHER CANBERRA
+OPTIONS_GROUP=	SPAM
+OPTIONS_GROUP_SPAM=SPAMASSASSIN BOGOFILTER
+
+OPTIONS_SUB=	yes
+
 CANBERRA_DESC=	Canberra theme audio plugin
 WEATHER_DESC=	Weather calendar backend
+SPAM_DESC=	Spam filter support
 SPAMASSASSIN_DESC=	SpamAssassin spam filtering
+BOGOFILTER_DESC=	Bogofilter spam filtering
 PST_DESC=	Outlook .pst importer
 MAPS_DESC=	Contact maps
 
-.include <bsd.port.options.mk>
-
-USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-openldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-openldap=no
-.endif
-
-.if ${PORT_OPTIONS:MWEATHER}
-LIB_DEPENDS+=	libgweather-3.so:${PORTSDIR}/net/libgweather
-CONFIGURE_ARGS+=--enable-weather
-PLIST_SUB+=	WEATHER=""
-.else
-CONFIGURE_ARGS+=--disable-weather
-PLIST_SUB+=	WEATHER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-.endif
-
-.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
-HEIMDAL_HOME?=		${LOCALBASE}
-LIB_DEPENDS+=		krb5.26:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} \
-			--with-krb5-includes=${HEIMDAL_HOME}/include
-KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
-.elif !defined(NO_KERBEROS)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
-.endif
-
-.if ${PORT_OPTIONS:MCANBERRA}
-LIB_DEPENDS+=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-CONFIGURE_ARGS+=--enable-canberra=yes
-PLIST_SUB+=	CANBERRA=""
-.else
-CONFIGURE_ARGS+=--enable-canberra=no
-PLIST_SUB+=	CANBERRA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPST}
-CONFIGURE_ARGS+=	--enable-pst-import
-BUILD_DEPENDS+=		libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
-RUN_DEPENDS+=		libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
-PLIST_SUB+=		PST=""
-.else
-CONFIGURE_ARGS+=	--disable-pst-import
-PLIST_SUB+=		PST="@comment "
-.endif
-
-#.if ${PORT_OPTIONS:MMAPS}
-# needs geoclue
-#LIB_DEPENDS+=		champlain-0.12:${PORTSDIR}/graphics/libchamplain
-#CONFIGURE_ARGS+=	--enable-contact-maps
-#PLIST_SUB+=		MAPS=""
-#.else
-CONFIGURE_ARGS+=	--disable-contact-maps
-PLIST_SUB+=		MAPS="@comment "
-#.endif
+LDAP_CONFIGURE_WITH=	openldap
+LDAP_USE=	OPENLDAP=yes
+
+WEATHER_LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather
+WEATHER_CONFIGURE_ENABLE=	weather
+
+SPAMASSASSIN_CONFIGURE_ENABLE=	spamassassin
+SPAMASSASSIN_BUILD_DEPEND=	spamassassin:${PORTSDIR}/mail/spamassassin
+SPAMASSASSIN_RUN_DEPEND=	spamassassin:${PORTSDIR}/mail/spamassassin
+
+BOGOFILTER_CONFIGURE_ENABLE=	bogofilter
+BOGOFILTER_BUILD_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
+BOGOFILTER_RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
+
+CANBERRA_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+CANBERRA_CONFIGURE_ENABLE=	canberra
+
+PST_CONFIGURE_ENABLE=	pst-import
+PST_BUILD_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+PST_RUN_DEPENDS=	libpst>=0.6.58_1:${PORTSDIR}/mail/libpst
+
+CONFIGURE_ARGS+=--disable-contact-maps
+#MAPS_CONFIGURE_ENABLE=	contact-maps
+#MAPS_LIB_DEPENDS=	libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
+#			libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+#MAPS_BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
@@ -141,11 +112,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
 		${WRKSRC}/modules/bogofilter/evolution-bogofilter.c
-	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
+#	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/${EVO_VERSION}/modules/*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/3.6/lib*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/3.6/plugins/liborg-gnome-*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/*/*/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/evolution/*/lib*.so
 
 .include <bsd.port.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index d634eed80..86c8d3e77 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-3.6.4.tar.xz) = 7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1
-SIZE (gnome3/evolution-3.6.4.tar.xz) = 12401324
+SHA256 (gnome3/evolution-3.12.1.tar.xz) = a4b5058a82949e883956863d23fd65cd4e89d6a1fb18d4d35b3ddaf4464bf52a
+SIZE (gnome3/evolution-3.12.1.tar.xz) = 12111704
diff --git a/mail/evolution/files/patch-configure b/mail/evolution/files/patch-configure
index cb75d9bcf..1c7bafc75 100644
--- a/mail/evolution/files/patch-configure
+++ b/mail/evolution/files/patch-configure
@@ -17,11 +17,3 @@
  *)
  	os_win32=no
  	NO_UNDEFINED='-no-undefined'
-@@ -16512,6 +16522,7 @@
- 		#include <sys/socket.h>
- 		#include <netinet/in.h>
- 		#include <netdb.h>
-+		#include <stdio.h>
- 
- 		#define BUFSIZE (sizeof(struct hostent)+10)
- 
diff --git a/mail/evolution/files/patch-mail_Makefile.in b/mail/evolution/files/patch-mail_Makefile.in
deleted file mode 100644
index fd21d5553..000000000
--- a/mail/evolution/files/patch-mail_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- mail/Makefile.in.orig	2013-04-10 09:02:35.458585186 +0000
-+++ mail/Makefile.in	2013-04-10 09:03:56.381576764 +0000
-@@ -727,8 +727,7 @@
- 	$(GTKHTML_LIBS)					\
- 	$(E_WIDGETS_LIBS)				\
- 	$(SMIME_LIBS)					\
--	$(LIBSOUP_LIBS)					\
--	-lresolv
-+	$(LIBSOUP_LIBS)
- 
- libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
- libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
-@@ -744,8 +743,7 @@
- 
- test_mail_autoconfig_LDADD = \
- 	$(EVOLUTION_DATA_SERVER_LIBS)			\
--	$(GNOME_PLATFORM_LIBS)				\
--	-lresolv
-+	$(GNOME_PLATFORM_LIBS)
- 
- 
- # Misc data to install
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index de2c84c38..1833af0cd 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -3,7 +3,6 @@ etc/xdg/autostart/evolution-alarm-notify.desktop
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
 include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h
 include/evolution-%%VERSION%%/calendar/gui/calendar-config.h
-include/evolution-%%VERSION%%/calendar/gui/calendar-view-factory.h
 include/evolution-%%VERSION%%/calendar/gui/calendar-view.h
 include/evolution-%%VERSION%%/calendar/gui/comp-util.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-dialog.h
@@ -29,7 +28,6 @@ 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
@@ -62,11 +60,11 @@ 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/e-weekday-chooser.h
 include/evolution-%%VERSION%%/calendar/gui/gnome-cal.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-activity.h
 include/evolution-%%VERSION%%/composer/e-composer-common.h
@@ -79,41 +77,243 @@ include/evolution-%%VERSION%%/composer/e-composer-private.h
 include/evolution-%%VERSION%%/composer/e-composer-spell-header.h
 include/evolution-%%VERSION%%/composer/e-composer-text-header.h
 include/evolution-%%VERSION%%/composer/e-msg-composer.h
+include/evolution-%%VERSION%%/e-util/e-action-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-activity-bar.h
+include/evolution-%%VERSION%%/e-util/e-activity-proxy.h
 include/evolution-%%VERSION%%/e-util/e-activity.h
+include/evolution-%%VERSION%%/e-util/e-alarm-selector.h
+include/evolution-%%VERSION%%/e-util/e-alert-bar.h
+include/evolution-%%VERSION%%/e-util/e-alert-dialog.h
+include/evolution-%%VERSION%%/e-util/e-alert-sink.h
+include/evolution-%%VERSION%%/e-util/e-alert.h
+include/evolution-%%VERSION%%/e-util/e-attachment-bar.h
+include/evolution-%%VERSION%%/e-util/e-attachment-button.h
+include/evolution-%%VERSION%%/e-util/e-attachment-dialog.h
+include/evolution-%%VERSION%%/e-util/e-attachment-handler-image.h
+include/evolution-%%VERSION%%/e-util/e-attachment-handler.h
+include/evolution-%%VERSION%%/e-util/e-attachment-icon-view.h
+include/evolution-%%VERSION%%/e-util/e-attachment-paned.h
+include/evolution-%%VERSION%%/e-util/e-attachment-store.h
+include/evolution-%%VERSION%%/e-util/e-attachment-tree-view.h
+include/evolution-%%VERSION%%/e-util/e-attachment-view.h
+include/evolution-%%VERSION%%/e-util/e-attachment.h
+include/evolution-%%VERSION%%/e-util/e-auth-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-autocomplete-selector.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
+include/evolution-%%VERSION%%/e-util/e-book-source-config.h
+include/evolution-%%VERSION%%/e-util/e-buffer-tagger.h
+include/evolution-%%VERSION%%/e-util/e-cal-source-config.h
+include/evolution-%%VERSION%%/e-util/e-calendar-item.h
+include/evolution-%%VERSION%%/e-util/e-calendar.h
+include/evolution-%%VERSION%%/e-util/e-canvas-background.h
+include/evolution-%%VERSION%%/e-util/e-canvas-utils.h
+include/evolution-%%VERSION%%/e-util/e-canvas-vbox.h
+include/evolution-%%VERSION%%/e-util/e-canvas.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
+include/evolution-%%VERSION%%/e-util/e-categories-dialog.h
+include/evolution-%%VERSION%%/e-util/e-categories-editor.h
+include/evolution-%%VERSION%%/e-util/e-categories-selector.h
+include/evolution-%%VERSION%%/e-util/e-category-completion.h
+include/evolution-%%VERSION%%/e-util/e-category-editor.h
+include/evolution-%%VERSION%%/e-util/e-cell-checkbox.h
+include/evolution-%%VERSION%%/e-util/e-cell-combo.h
+include/evolution-%%VERSION%%/e-util/e-cell-date-edit.h
+include/evolution-%%VERSION%%/e-util/e-cell-date.h
+include/evolution-%%VERSION%%/e-util/e-cell-hbox.h
+include/evolution-%%VERSION%%/e-util/e-cell-number.h
+include/evolution-%%VERSION%%/e-util/e-cell-percent.h
+include/evolution-%%VERSION%%/e-util/e-cell-pixbuf.h
+include/evolution-%%VERSION%%/e-util/e-cell-popup.h
+include/evolution-%%VERSION%%/e-util/e-cell-renderer-color.h
+include/evolution-%%VERSION%%/e-util/e-cell-size.h
+include/evolution-%%VERSION%%/e-util/e-cell-text.h
+include/evolution-%%VERSION%%/e-util/e-cell-toggle.h
+include/evolution-%%VERSION%%/e-util/e-cell-tree.h
+include/evolution-%%VERSION%%/e-util/e-cell-vbox.h
+include/evolution-%%VERSION%%/e-util/e-cell.h
+include/evolution-%%VERSION%%/e-util/e-charset-combo-box.h
 include/evolution-%%VERSION%%/e-util/e-charset.h
+include/evolution-%%VERSION%%/e-util/e-client-cache.h
+include/evolution-%%VERSION%%/e-util/e-client-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-client-selector.h
 include/evolution-%%VERSION%%/e-util/e-config.h
+include/evolution-%%VERSION%%/e-util/e-contact-store.h
+include/evolution-%%VERSION%%/e-util/e-data-capture.h
+include/evolution-%%VERSION%%/e-util/e-dateedit.h
 include/evolution-%%VERSION%%/e-util/e-datetime-format.h
+include/evolution-%%VERSION%%/e-util/e-destination-store.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-event.h
-include/evolution-%%VERSION%%/e-util/e-file-utils.h
 include/evolution-%%VERSION%%/e-util/e-file-request.h
+include/evolution-%%VERSION%%/e-util/e-file-utils.h
+include/evolution-%%VERSION%%/e-util/e-filter-code.h
+include/evolution-%%VERSION%%/e-util/e-filter-color.h
+include/evolution-%%VERSION%%/e-util/e-filter-datespec.h
+include/evolution-%%VERSION%%/e-util/e-filter-element.h
+include/evolution-%%VERSION%%/e-util/e-filter-file.h
+include/evolution-%%VERSION%%/e-util/e-filter-input.h
+include/evolution-%%VERSION%%/e-util/e-filter-int.h
+include/evolution-%%VERSION%%/e-util/e-filter-option.h
+include/evolution-%%VERSION%%/e-util/e-filter-part.h
+include/evolution-%%VERSION%%/e-util/e-filter-rule.h
+include/evolution-%%VERSION%%/e-util/e-focus-tracker.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-image-chooser.h
+include/evolution-%%VERSION%%/e-util/e-import-assistant.h
 include/evolution-%%VERSION%%/e-util/e-import.h
+include/evolution-%%VERSION%%/e-util/e-interval-chooser.h
+include/evolution-%%VERSION%%/e-util/e-mail-identity-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-editor.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-manager.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-preview.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-script-dialog.h
+include/evolution-%%VERSION%%/e-util/e-mail-signature-tree-view.h
+include/evolution-%%VERSION%%/e-util/e-map.h
 include/evolution-%%VERSION%%/e-util/e-marshal.h
+include/evolution-%%VERSION%%/e-util/e-menu-tool-action.h
+include/evolution-%%VERSION%%/e-util/e-menu-tool-button.h
+include/evolution-%%VERSION%%/e-util/e-misc-utils.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
+include/evolution-%%VERSION%%/e-util/e-name-selector-dialog.h
+include/evolution-%%VERSION%%/e-util/e-name-selector-entry.h
+include/evolution-%%VERSION%%/e-util/e-name-selector-list.h
+include/evolution-%%VERSION%%/e-util/e-name-selector-model.h
+include/evolution-%%VERSION%%/e-util/e-name-selector.h
+include/evolution-%%VERSION%%/e-util/e-online-button.h
+include/evolution-%%VERSION%%/e-util/e-paned.h
+include/evolution-%%VERSION%%/e-util/e-passwords.h
+include/evolution-%%VERSION%%/e-util/e-photo-cache.h
+include/evolution-%%VERSION%%/e-util/e-photo-source.h
+include/evolution-%%VERSION%%/e-util/e-picture-gallery.h
 include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
 include/evolution-%%VERSION%%/e-util/e-poolv.h
+include/evolution-%%VERSION%%/e-util/e-popup-action.h
+include/evolution-%%VERSION%%/e-util/e-popup-menu.h
+include/evolution-%%VERSION%%/e-util/e-port-entry.h
+include/evolution-%%VERSION%%/e-util/e-preferences-window.h
+include/evolution-%%VERSION%%/e-util/e-preview-pane.h
 include/evolution-%%VERSION%%/e-util/e-print.h
+include/evolution-%%VERSION%%/e-util/e-printable.h
+include/evolution-%%VERSION%%/e-util/e-proxy-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-proxy-editor.h
+include/evolution-%%VERSION%%/e-util/e-proxy-link-selector.h
+include/evolution-%%VERSION%%/e-util/e-proxy-preferences.h
+include/evolution-%%VERSION%%/e-util/e-proxy-selector.h
+include/evolution-%%VERSION%%/e-util/e-reflow-model.h
+include/evolution-%%VERSION%%/e-util/e-reflow.h
+include/evolution-%%VERSION%%/e-util/e-rule-context.h
+include/evolution-%%VERSION%%/e-util/e-rule-editor.h
+include/evolution-%%VERSION%%/e-util/e-search-bar.h
+include/evolution-%%VERSION%%/e-util/e-selectable.h
+include/evolution-%%VERSION%%/e-util/e-selection-model-array.h
+include/evolution-%%VERSION%%/e-util/e-selection-model-simple.h
+include/evolution-%%VERSION%%/e-util/e-selection-model.h
 include/evolution-%%VERSION%%/e-util/e-selection.h
+include/evolution-%%VERSION%%/e-util/e-send-options.h
 include/evolution-%%VERSION%%/e-util/e-sorter-array.h
 include/evolution-%%VERSION%%/e-util/e-sorter.h
+include/evolution-%%VERSION%%/e-util/e-source-combo-box.h
+include/evolution-%%VERSION%%/e-util/e-source-config-backend.h
+include/evolution-%%VERSION%%/e-util/e-source-config-dialog.h
+include/evolution-%%VERSION%%/e-util/e-source-config.h
+include/evolution-%%VERSION%%/e-util/e-source-selector-dialog.h
+include/evolution-%%VERSION%%/e-util/e-source-selector.h
 include/evolution-%%VERSION%%/e-util/e-source-util.h
+include/evolution-%%VERSION%%/e-util/e-spell-entry.h
+include/evolution-%%VERSION%%/e-util/e-spell-text-view.h
 include/evolution-%%VERSION%%/e-util/e-stock-request.h
+include/evolution-%%VERSION%%/e-util/e-table-click-to-add.h
+include/evolution-%%VERSION%%/e-util/e-table-col-dnd.h
+include/evolution-%%VERSION%%/e-util/e-table-col.h
+include/evolution-%%VERSION%%/e-util/e-table-column-selector.h
+include/evolution-%%VERSION%%/e-util/e-table-column-specification.h
+include/evolution-%%VERSION%%/e-util/e-table-config.h
+include/evolution-%%VERSION%%/e-util/e-table-defines.h
+include/evolution-%%VERSION%%/e-util/e-table-extras.h
+include/evolution-%%VERSION%%/e-util/e-table-field-chooser-dialog.h
+include/evolution-%%VERSION%%/e-util/e-table-field-chooser-item.h
+include/evolution-%%VERSION%%/e-util/e-table-field-chooser.h
+include/evolution-%%VERSION%%/e-util/e-table-group-container.h
+include/evolution-%%VERSION%%/e-util/e-table-group-leaf.h
+include/evolution-%%VERSION%%/e-util/e-table-group.h
+include/evolution-%%VERSION%%/e-util/e-table-header-item.h
+include/evolution-%%VERSION%%/e-util/e-table-header-utils.h
+include/evolution-%%VERSION%%/e-util/e-table-header.h
+include/evolution-%%VERSION%%/e-util/e-table-item.h
+include/evolution-%%VERSION%%/e-util/e-table-model.h
+include/evolution-%%VERSION%%/e-util/e-table-one.h
+include/evolution-%%VERSION%%/e-util/e-table-search.h
+include/evolution-%%VERSION%%/e-util/e-table-selection-model.h
+include/evolution-%%VERSION%%/e-util/e-table-sort-info.h
+include/evolution-%%VERSION%%/e-util/e-table-sorted-variable.h
+include/evolution-%%VERSION%%/e-util/e-table-sorted.h
+include/evolution-%%VERSION%%/e-util/e-table-sorter.h
+include/evolution-%%VERSION%%/e-util/e-table-sorting-utils.h
+include/evolution-%%VERSION%%/e-util/e-table-specification.h
+include/evolution-%%VERSION%%/e-util/e-table-state.h
+include/evolution-%%VERSION%%/e-util/e-table-subset-variable.h
+include/evolution-%%VERSION%%/e-util/e-table-subset.h
+include/evolution-%%VERSION%%/e-util/e-table-utils.h
+include/evolution-%%VERSION%%/e-util/e-table.h
 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-ui-manager.h
+include/evolution-%%VERSION%%/e-util/e-text-model-repos.h
+include/evolution-%%VERSION%%/e-util/e-text-model.h
+include/evolution-%%VERSION%%/e-util/e-text.h
+include/evolution-%%VERSION%%/e-util/e-timezone-dialog.h
+include/evolution-%%VERSION%%/e-util/e-tree-model-generator.h
+include/evolution-%%VERSION%%/e-util/e-tree-model.h
+include/evolution-%%VERSION%%/e-util/e-tree-selection-model.h
+include/evolution-%%VERSION%%/e-util/e-tree-table-adapter.h
+include/evolution-%%VERSION%%/e-util/e-tree-view-frame.h
+include/evolution-%%VERSION%%/e-util/e-tree.h
 include/evolution-%%VERSION%%/e-util/e-unicode.h
+include/evolution-%%VERSION%%/e-util/e-url-entry.h
 include/evolution-%%VERSION%%/e-util/e-util-enums.h
 include/evolution-%%VERSION%%/e-util/e-util-enumtypes.h
 include/evolution-%%VERSION%%/e-util/e-util.h
+include/evolution-%%VERSION%%/e-util/e-web-view-gtkhtml.h
+include/evolution-%%VERSION%%/e-util/e-web-view-preview.h
+include/evolution-%%VERSION%%/e-util/e-web-view.h
+include/evolution-%%VERSION%%/e-util/e-widget-undo.h
+include/evolution-%%VERSION%%/e-util/e-xml-utils.h
+include/evolution-%%VERSION%%/e-util/ea-calendar-cell.h
+include/evolution-%%VERSION%%/e-util/ea-calendar-item.h
+include/evolution-%%VERSION%%/e-util/ea-cell-table.h
+include/evolution-%%VERSION%%/e-util/ea-factory.h
+include/evolution-%%VERSION%%/e-util/ea-widgets.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell-popup.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell-registry.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell-toggle.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell-tree.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell-vbox.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-cell.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-click-to-add-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-click-to-add.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-column-header.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-item-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table-item.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-table.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-text-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-text.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-tree-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-e-tree.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-factory.h
+include/evolution-%%VERSION%%/e-util/gal-a11y-util.h
+include/evolution-%%VERSION%%/e-util/gal-view-collection.h
+include/evolution-%%VERSION%%/e-util/gal-view-etable.h
+include/evolution-%%VERSION%%/e-util/gal-view-instance-save-as-dialog.h
+include/evolution-%%VERSION%%/e-util/gal-view-instance.h
+include/evolution-%%VERSION%%/e-util/gal-view.h
 include/evolution-%%VERSION%%/em-format/e-mail-extension-registry.h
-include/evolution-%%VERSION%%/em-format/e-mail-extension.h
+include/evolution-%%VERSION%%/em-format/e-mail-formatter-enums.h
+include/evolution-%%VERSION%%/em-format/e-mail-formatter-enumtypes.h
 include/evolution-%%VERSION%%/em-format/e-mail-formatter-extension.h
 include/evolution-%%VERSION%%/em-format/e-mail-formatter-print.h
 include/evolution-%%VERSION%%/em-format/e-mail-formatter-quote.h
@@ -124,43 +324,31 @@ include/evolution-%%VERSION%%/em-format/e-mail-parser-extension.h
 include/evolution-%%VERSION%%/em-format/e-mail-parser.h
 include/evolution-%%VERSION%%/em-format/e-mail-part-attachment-bar.h
 include/evolution-%%VERSION%%/em-format/e-mail-part-attachment.h
+include/evolution-%%VERSION%%/em-format/e-mail-part-audio.h
+include/evolution-%%VERSION%%/em-format/e-mail-part-headers.h
+include/evolution-%%VERSION%%/em-format/e-mail-part-image.h
 include/evolution-%%VERSION%%/em-format/e-mail-part-list.h
 include/evolution-%%VERSION%%/em-format/e-mail-part-utils.h
 include/evolution-%%VERSION%%/em-format/e-mail-part.h
 include/evolution-%%VERSION%%/em-format/e-mail-stripsig-filter.h
-include/evolution-%%VERSION%%/filter/e-filter-code.h
-include/evolution-%%VERSION%%/filter/e-filter-color.h
-include/evolution-%%VERSION%%/filter/e-filter-datespec.h
-include/evolution-%%VERSION%%/filter/e-filter-element.h
-include/evolution-%%VERSION%%/filter/e-filter-file.h
-include/evolution-%%VERSION%%/filter/e-filter-input.h
-include/evolution-%%VERSION%%/filter/e-filter-int.h
-include/evolution-%%VERSION%%/filter/e-filter-option.h
-include/evolution-%%VERSION%%/filter/e-filter-part.h
-include/evolution-%%VERSION%%/filter/e-filter-rule.h
-include/evolution-%%VERSION%%/filter/e-rule-context.h
-include/evolution-%%VERSION%%/filter/e-rule-editor.h
-include/evolution-%%VERSION%%/libevolution-utils/e-alert.h
-include/evolution-%%VERSION%%/libevolution-utils/e-alert-dialog.h
-include/evolution-%%VERSION%%/libevolution-utils/e-alert-sink.h
-include/evolution-%%VERSION%%/libevolution-utils/e-xml-utils.h
-include/evolution-%%VERSION%%/libevolution-utils/evolution-util.h
-include/evolution-%%VERSION%%/libemail-utils/em-filter-folder-element.h
-include/evolution-%%VERSION%%/libemail-utils/em-vfolder-context.h
-include/evolution-%%VERSION%%/libemail-utils/em-vfolder-rule.h
-include/evolution-%%VERSION%%/libemail-utils/mail-mt.h
 include/evolution-%%VERSION%%/libemail-engine/camel-null-store.h
+include/evolution-%%VERSION%%/libemail-engine/camel-sasl-xoauth2.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-authenticator.h
-include/evolution-%%VERSION%%/libemail-engine/e-mail-enums.h
-include/evolution-%%VERSION%%/libemail-engine/e-mail-enumtypes.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-engine-enums.h
+include/evolution-%%VERSION%%/libemail-engine/e-mail-engine-enumtypes.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-folder-utils.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-junk-filter.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-session-utils.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-session.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-store-utils.h
 include/evolution-%%VERSION%%/libemail-engine/e-mail-utils.h
+include/evolution-%%VERSION%%/libemail-engine/em-filter-folder-element.h
+include/evolution-%%VERSION%%/libemail-engine/em-vfolder-context.h
+include/evolution-%%VERSION%%/libemail-engine/em-vfolder-rule.h
+include/evolution-%%VERSION%%/libemail-engine/libemail-engine.h
 include/evolution-%%VERSION%%/libemail-engine/mail-config.h
 include/evolution-%%VERSION%%/libemail-engine/mail-folder-cache.h
+include/evolution-%%VERSION%%/libemail-engine/mail-mt.h
 include/evolution-%%VERSION%%/libemail-engine/mail-ops.h
 include/evolution-%%VERSION%%/libemail-engine/mail-tools.h
 include/evolution-%%VERSION%%/libemail-engine/mail-vfolder.h
@@ -210,6 +398,8 @@ include/evolution-%%VERSION%%/mail/e-mail-config-welcome-page.h
 include/evolution-%%VERSION%%/mail/e-mail-config-window.h
 include/evolution-%%VERSION%%/mail/e-mail-display-popup-extension.h
 include/evolution-%%VERSION%%/mail/e-mail-display.h
+include/evolution-%%VERSION%%/mail/e-mail-enums.h
+include/evolution-%%VERSION%%/mail/e-mail-enumtypes.h
 include/evolution-%%VERSION%%/mail/e-mail-folder-pane.h
 include/evolution-%%VERSION%%/mail/e-mail-junk-options.h
 include/evolution-%%VERSION%%/mail/e-mail-label-action.h
@@ -219,12 +409,13 @@ include/evolution-%%VERSION%%/mail/e-mail-label-manager.h
 include/evolution-%%VERSION%%/mail/e-mail-label-tree-view.h
 include/evolution-%%VERSION%%/mail/e-mail-message-pane.h
 include/evolution-%%VERSION%%/mail/e-mail-migrate.h
-include/evolution-%%VERSION%%/mail/e-mail-notebook-view.h
 include/evolution-%%VERSION%%/mail/e-mail-paned-view.h
+include/evolution-%%VERSION%%/mail/e-mail-print-config-headers.h
 include/evolution-%%VERSION%%/mail/e-mail-printer.h
 include/evolution-%%VERSION%%/mail/e-mail-reader-utils.h
 include/evolution-%%VERSION%%/mail/e-mail-reader.h
 include/evolution-%%VERSION%%/mail/e-mail-request.h
+include/evolution-%%VERSION%%/mail/e-mail-send-account-override.h
 include/evolution-%%VERSION%%/mail/e-mail-sidebar.h
 include/evolution-%%VERSION%%/mail/e-mail-tag-editor.h
 include/evolution-%%VERSION%%/mail/e-mail-ui-session.h
@@ -254,95 +445,11 @@ include/evolution-%%VERSION%%/mail/mail-autofilter.h
 include/evolution-%%VERSION%%/mail/mail-send-recv.h
 include/evolution-%%VERSION%%/mail/mail-vfolder-ui.h
 include/evolution-%%VERSION%%/mail/message-list.h
-include/evolution-%%VERSION%%/menus/gal-define-views-dialog.h
-include/evolution-%%VERSION%%/menus/gal-define-views-model.h
-include/evolution-%%VERSION%%/menus/gal-view-collection.h
-include/evolution-%%VERSION%%/menus/gal-view-etable.h
-include/evolution-%%VERSION%%/menus/gal-view-factory-etable.h
-include/evolution-%%VERSION%%/menus/gal-view-factory.h
-include/evolution-%%VERSION%%/menus/gal-view-instance-save-as-dialog.h
-include/evolution-%%VERSION%%/menus/gal-view-instance.h
-include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
-include/evolution-%%VERSION%%/menus/gal-view.h
-include/evolution-%%VERSION%%/misc/e-action-combo-box.h
-include/evolution-%%VERSION%%/misc/e-activity-bar.h
-include/evolution-%%VERSION%%/misc/e-activity-proxy.h
-include/evolution-%%VERSION%%/misc/e-alarm-selector.h
-include/evolution-%%VERSION%%/misc/e-alert-bar.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-auth-combo-box.h
-include/evolution-%%VERSION%%/misc/e-autocomplete-selector.h
-include/evolution-%%VERSION%%/misc/e-book-source-config.h
-include/evolution-%%VERSION%%/misc/e-buffer-tagger.h
-include/evolution-%%VERSION%%/misc/e-cal-source-config.h
-include/evolution-%%VERSION%%/misc/e-calendar-item.h
-include/evolution-%%VERSION%%/misc/e-calendar.h
-include/evolution-%%VERSION%%/misc/e-canvas-background.h
-include/evolution-%%VERSION%%/misc/e-canvas-utils.h
-include/evolution-%%VERSION%%/misc/e-canvas-vbox.h
-include/evolution-%%VERSION%%/misc/e-canvas.h
-include/evolution-%%VERSION%%/misc/e-charset-combo-box.h
-include/evolution-%%VERSION%%/misc/e-contact-map-window.h
-include/evolution-%%VERSION%%/misc/e-contact-map.h
-include/evolution-%%VERSION%%/misc/e-contact-marker.h
-include/evolution-%%VERSION%%/misc/e-dateedit.h
-include/evolution-%%VERSION%%/misc/e-focus-tracker.h
-include/evolution-%%VERSION%%/misc/e-image-chooser.h
-include/evolution-%%VERSION%%/misc/e-import-assistant.h
-include/evolution-%%VERSION%%/misc/e-interval-chooser.h
-include/evolution-%%VERSION%%/misc/e-map.h
-include/evolution-%%VERSION%%/misc/e-mail-identity-combo-box.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-combo-box.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-editor.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-manager.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-preview.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-script-dialog.h
-include/evolution-%%VERSION%%/misc/e-mail-signature-tree-view.h
-include/evolution-%%VERSION%%/misc/e-menu-tool-action.h
-include/evolution-%%VERSION%%/misc/e-menu-tool-button.h
-include/evolution-%%VERSION%%/misc/e-online-button.h
-include/evolution-%%VERSION%%/misc/e-paned.h
-include/evolution-%%VERSION%%/misc/e-picture-gallery.h
-include/evolution-%%VERSION%%/misc/e-popup-action.h
-include/evolution-%%VERSION%%/misc/e-port-entry.h
-include/evolution-%%VERSION%%/misc/e-preferences-window.h
-include/evolution-%%VERSION%%/misc/e-preview-pane.h
-include/evolution-%%VERSION%%/misc/e-printable.h
-include/evolution-%%VERSION%%/misc/e-search-bar.h
-include/evolution-%%VERSION%%/misc/e-selectable.h
-include/evolution-%%VERSION%%/misc/e-selection-model-array.h
-include/evolution-%%VERSION%%/misc/e-selection-model-simple.h
-include/evolution-%%VERSION%%/misc/e-selection-model.h
-include/evolution-%%VERSION%%/misc/e-send-options.h
-include/evolution-%%VERSION%%/misc/e-source-config-backend.h
-include/evolution-%%VERSION%%/misc/e-source-config-dialog.h
-include/evolution-%%VERSION%%/misc/e-source-config.h
-include/evolution-%%VERSION%%/misc/e-spell-entry.h
-include/evolution-%%VERSION%%/misc/e-web-view-gtkhtml.h
-include/evolution-%%VERSION%%/misc/e-web-view.h
-include/evolution-%%VERSION%%/misc/e-web-view-preview.h
-include/evolution-%%VERSION%%/misc/e-url-entry.h
-include/evolution-%%VERSION%%/misc/ea-calendar-cell.h
-include/evolution-%%VERSION%%/misc/ea-calendar-item.h
-include/evolution-%%VERSION%%/misc/ea-cell-table.h
-include/evolution-%%VERSION%%/misc/ea-widgets.h
 include/evolution-%%VERSION%%/shell/e-shell-backend.h
 include/evolution-%%VERSION%%/shell/e-shell-common.h
 include/evolution-%%VERSION%%/shell/e-shell-content.h
 include/evolution-%%VERSION%%/shell/e-shell-enumtypes.h
 include/evolution-%%VERSION%%/shell/e-shell-searchbar.h
-include/evolution-%%VERSION%%/shell/e-shell-settings.h
 include/evolution-%%VERSION%%/shell/e-shell-sidebar.h
 include/evolution-%%VERSION%%/shell/e-shell-switcher.h
 include/evolution-%%VERSION%%/shell/e-shell-taskbar.h
@@ -351,305 +458,130 @@ include/evolution-%%VERSION%%/shell/e-shell-view.h
 include/evolution-%%VERSION%%/shell/e-shell-window-actions.h
 include/evolution-%%VERSION%%/shell/e-shell-window.h
 include/evolution-%%VERSION%%/shell/e-shell.h
-include/evolution-%%VERSION%%/shell/es-event.h
-include/evolution-%%VERSION%%/table/e-cell-checkbox.h
-include/evolution-%%VERSION%%/table/e-cell-combo.h
-include/evolution-%%VERSION%%/table/e-cell-date.h
-include/evolution-%%VERSION%%/table/e-cell-date-edit.h
-include/evolution-%%VERSION%%/table/e-cell-hbox.h
-include/evolution-%%VERSION%%/table/e-cell-number.h
-include/evolution-%%VERSION%%/table/e-cell-pixbuf.h
-include/evolution-%%VERSION%%/table/e-cell-popup.h
-include/evolution-%%VERSION%%/table/e-cell-percent.h
-include/evolution-%%VERSION%%/table/e-cell-size.h
-include/evolution-%%VERSION%%/table/e-cell-text.h
-include/evolution-%%VERSION%%/table/e-cell-toggle.h
-include/evolution-%%VERSION%%/table/e-cell-tree.h
-include/evolution-%%VERSION%%/table/e-cell-vbox.h
-include/evolution-%%VERSION%%/table/e-cell.h
-include/evolution-%%VERSION%%/table/e-popup-menu.h
-include/evolution-%%VERSION%%/table/e-table-click-to-add.h
-include/evolution-%%VERSION%%/table/e-table-col-dnd.h
-include/evolution-%%VERSION%%/table/e-table-col.h
-include/evolution-%%VERSION%%/table/e-table-column-specification.h
-include/evolution-%%VERSION%%/table/e-table-config.h
-include/evolution-%%VERSION%%/table/e-table-defines.h
-include/evolution-%%VERSION%%/table/e-table-extras.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser-dialog.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser-item.h
-include/evolution-%%VERSION%%/table/e-table-field-chooser.h
-include/evolution-%%VERSION%%/table/e-table-group-container.h
-include/evolution-%%VERSION%%/table/e-table-group-leaf.h
-include/evolution-%%VERSION%%/table/e-table-group.h
-include/evolution-%%VERSION%%/table/e-table-header-item.h
-include/evolution-%%VERSION%%/table/e-table-header-utils.h
-include/evolution-%%VERSION%%/table/e-table-header.h
-include/evolution-%%VERSION%%/table/e-table-item.h
-include/evolution-%%VERSION%%/table/e-table-memory-callbacks.h
-include/evolution-%%VERSION%%/table/e-table-memory-store.h
-include/evolution-%%VERSION%%/table/e-table-memory.h
-include/evolution-%%VERSION%%/table/e-table-model.h
-include/evolution-%%VERSION%%/table/e-table-one.h
-include/evolution-%%VERSION%%/table/e-table-search.h
-include/evolution-%%VERSION%%/table/e-table-selection-model.h
-include/evolution-%%VERSION%%/table/e-table-sort-info.h
-include/evolution-%%VERSION%%/table/e-table-sorted-variable.h
-include/evolution-%%VERSION%%/table/e-table-sorted.h
-include/evolution-%%VERSION%%/table/e-table-sorter.h
-include/evolution-%%VERSION%%/table/e-table-sorting-utils.h
-include/evolution-%%VERSION%%/table/e-table-specification.h
-include/evolution-%%VERSION%%/table/e-table-state.h
-include/evolution-%%VERSION%%/table/e-table-subset-variable.h
-include/evolution-%%VERSION%%/table/e-table-subset.h
-include/evolution-%%VERSION%%/table/e-table-utils.h
-include/evolution-%%VERSION%%/table/e-table-without.h
-include/evolution-%%VERSION%%/table/e-table.h
-include/evolution-%%VERSION%%/table/e-tree-memory-callbacks.h
-include/evolution-%%VERSION%%/table/e-tree-memory.h
-include/evolution-%%VERSION%%/table/e-tree-model.h
-include/evolution-%%VERSION%%/table/e-tree-selection-model.h
-include/evolution-%%VERSION%%/table/e-tree-sorted.h
-include/evolution-%%VERSION%%/table/e-tree-table-adapter.h
-include/evolution-%%VERSION%%/table/e-tree.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-popup.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-registry.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-toggle.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-tree.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-vbox.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add-factory.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-column-header.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-factory.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-item-factory.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table-item.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-table.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-tree-factory.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-tree.h
-include/evolution-%%VERSION%%/text/e-reflow-model.h
-include/evolution-%%VERSION%%/text/e-reflow.h
-include/evolution-%%VERSION%%/text/e-text-model-repos.h
-include/evolution-%%VERSION%%/text/e-text-model.h
-include/evolution-%%VERSION%%/text/e-text.h
-include/evolution-%%VERSION%%/text/gal-a11y-e-text-factory.h
-include/evolution-%%VERSION%%/text/gal-a11y-e-text.h
-lib/evolution/%%VERSION%%/libeabutil.a
 lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
-lib/evolution/%%VERSION%%/libcomposer.a
-lib/evolution/%%VERSION%%/libcomposer.la
-lib/evolution/%%VERSION%%/libcomposer.so
-lib/evolution/%%VERSION%%/libecontacteditor.a
 lib/evolution/%%VERSION%%/libecontacteditor.la
 lib/evolution/%%VERSION%%/libecontacteditor.so
-lib/evolution/%%VERSION%%/libecontactlisteditor.a
 lib/evolution/%%VERSION%%/libecontactlisteditor.la
 lib/evolution/%%VERSION%%/libecontactlisteditor.so
-lib/evolution/%%VERSION%%/libemail-engine.so
 lib/evolution/%%VERSION%%/libemail-engine.la
-lib/evolution/%%VERSION%%/libemail-engine.a
-lib/evolution/%%VERSION%%/libemail-utils.so
-lib/evolution/%%VERSION%%/libemail-utils.la
-lib/evolution/%%VERSION%%/libemail-utils.a
-lib/evolution/%%VERSION%%/libemformat.a
-lib/evolution/%%VERSION%%/libemformat.la
-lib/evolution/%%VERSION%%/libemformat.so
-lib/evolution/%%VERSION%%/libemiscwidgets.a
-lib/evolution/%%VERSION%%/libemiscwidgets.la
-lib/evolution/%%VERSION%%/libemiscwidgets.so
-lib/evolution/%%VERSION%%/libeshell.a
-lib/evolution/%%VERSION%%/libeshell.la
-lib/evolution/%%VERSION%%/libeshell.so
-lib/evolution/%%VERSION%%/libessmime.a
+lib/evolution/%%VERSION%%/libemail-engine.so
 lib/evolution/%%VERSION%%/libessmime.la
 lib/evolution/%%VERSION%%/libessmime.so
-lib/evolution/%%VERSION%%/libetable.a
-lib/evolution/%%VERSION%%/libetable.la
-lib/evolution/%%VERSION%%/libetable.so
-lib/evolution/%%VERSION%%/libetext.a
-lib/evolution/%%VERSION%%/libetext.la
-lib/evolution/%%VERSION%%/libetext.so
-lib/evolution/%%VERSION%%/libetimezonedialog.a
-lib/evolution/%%VERSION%%/libetimezonedialog.la
-lib/evolution/%%VERSION%%/libetimezonedialog.so
-lib/evolution/%%VERSION%%/libeutil.a
-lib/evolution/%%VERSION%%/libeutil.la
-lib/evolution/%%VERSION%%/libeutil.so
-lib/evolution/%%VERSION%%/libevolution-a11y.a
-lib/evolution/%%VERSION%%/libevolution-a11y.la
-lib/evolution/%%VERSION%%/libevolution-a11y.so
-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-calendar.a
-lib/evolution/%%VERSION%%/libevolution-calendar.la
-lib/evolution/%%VERSION%%/libevolution-calendar.so
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.a
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
-lib/evolution/%%VERSION%%/libevolution-mail.a
-lib/evolution/%%VERSION%%/libevolution-mail.la
-lib/evolution/%%VERSION%%/libevolution-mail.so
-lib/evolution/%%VERSION%%/libevolution-mail-importers.a
+lib/evolution/%%VERSION%%/libevolution-calendar.la
+lib/evolution/%%VERSION%%/libevolution-calendar.so
+lib/evolution/%%VERSION%%/libevolution-mail-composer.la
+lib/evolution/%%VERSION%%/libevolution-mail-composer.so
+lib/evolution/%%VERSION%%/libevolution-mail-formatter.la
+lib/evolution/%%VERSION%%/libevolution-mail-formatter.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
-lib/evolution/%%VERSION%%/libevolution-smime.a
+lib/evolution/%%VERSION%%/libevolution-mail.la
+lib/evolution/%%VERSION%%/libevolution-mail.so
+lib/evolution/%%VERSION%%/libevolution-shell.la
+lib/evolution/%%VERSION%%/libevolution-shell.so
 lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
-lib/evolution/%%VERSION%%/libevolution-utils.so
-lib/evolution/%%VERSION%%/libevolution-utils.la
-lib/evolution/%%VERSION%%/libevolution-utils.a
-lib/evolution/%%VERSION%%/libfilter.a
-lib/evolution/%%VERSION%%/libfilter.la
-lib/evolution/%%VERSION%%/libfilter.so
-lib/evolution/%%VERSION%%/libgnomecanvas.a
+lib/evolution/%%VERSION%%/libevolution-util.la
+lib/evolution/%%VERSION%%/libevolution-util.so
 lib/evolution/%%VERSION%%/libgnomecanvas.la
 lib/evolution/%%VERSION%%/libgnomecanvas.so
-lib/evolution/%%VERSION%%/libmenus.a
-lib/evolution/%%VERSION%%/libmenus.la
-lib/evolution/%%VERSION%%/libmenus.so
-lib/evolution/%%VERSION%%/modules/module-addressbook.a
 lib/evolution/%%VERSION%%/modules/module-addressbook.la
 lib/evolution/%%VERSION%%/modules/module-addressbook.so
-lib/evolution/%%VERSION%%/modules/module-audio-inline.a
-lib/evolution/%%VERSION%%/modules/module-audio-inline.la
-lib/evolution/%%VERSION%%/modules/module-audio-inline.so
-lib/evolution/%%VERSION%%/modules/module-backup-restore.a
 lib/evolution/%%VERSION%%/modules/module-backup-restore.la
 lib/evolution/%%VERSION%%/modules/module-backup-restore.so
-lib/evolution/%%VERSION%%/modules/module-bogofilter.a
-lib/evolution/%%VERSION%%/modules/module-bogofilter.la
-lib/evolution/%%VERSION%%/modules/module-bogofilter.so
-lib/evolution/%%VERSION%%/modules/module-book-config-google.a
+%%BOGOFILTER%%lib/evolution/%%VERSION%%/modules/module-bogofilter.la
+%%BOGOFILTER%%lib/evolution/%%VERSION%%/modules/module-bogofilter.so
 lib/evolution/%%VERSION%%/modules/module-book-config-google.la
 lib/evolution/%%VERSION%%/modules/module-book-config-google.so
-lib/evolution/%%VERSION%%/modules/module-book-config-ldap.a
-lib/evolution/%%VERSION%%/modules/module-book-config-ldap.la
-lib/evolution/%%VERSION%%/modules/module-book-config-ldap.so
-lib/evolution/%%VERSION%%/modules/module-book-config-local.a
+%%LDAP%%lib/evolution/%%VERSION%%/modules/module-book-config-ldap.la
+%%LDAP%%lib/evolution/%%VERSION%%/modules/module-book-config-ldap.so
 lib/evolution/%%VERSION%%/modules/module-book-config-local.la
 lib/evolution/%%VERSION%%/modules/module-book-config-local.so
-lib/evolution/%%VERSION%%/modules/module-book-config-webdav.a
 lib/evolution/%%VERSION%%/modules/module-book-config-webdav.la
 lib/evolution/%%VERSION%%/modules/module-book-config-webdav.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-caldav.a
 lib/evolution/%%VERSION%%/modules/module-cal-config-caldav.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-caldav.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-contacts.a
 lib/evolution/%%VERSION%%/modules/module-cal-config-contacts.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-contacts.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-google.a
 lib/evolution/%%VERSION%%/modules/module-cal-config-google.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-google.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-local.a
 lib/evolution/%%VERSION%%/modules/module-cal-config-local.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-local.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-weather.a
-lib/evolution/%%VERSION%%/modules/module-cal-config-weather.la
-lib/evolution/%%VERSION%%/modules/module-cal-config-weather.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-webcal.a
+%%WEATHER%%lib/evolution/%%VERSION%%/modules/module-cal-config-weather.la
+%%WEATHER%%lib/evolution/%%VERSION%%/modules/module-cal-config-weather.so
 lib/evolution/%%VERSION%%/modules/module-cal-config-webcal.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-webcal.so
-lib/evolution/%%VERSION%%/modules/module-calendar.a
 lib/evolution/%%VERSION%%/modules/module-calendar.la
 lib/evolution/%%VERSION%%/modules/module-calendar.so
-lib/evolution/%%VERSION%%/modules/module-composer-autosave.a
 lib/evolution/%%VERSION%%/modules/module-composer-autosave.la
 lib/evolution/%%VERSION%%/modules/module-composer-autosave.so
-lib/evolution/%%VERSION%%/modules/module-imap-features.a
-lib/evolution/%%VERSION%%/modules/module-imap-features.la
-lib/evolution/%%VERSION%%/modules/module-imap-features.so
-lib/evolution/%%VERSION%%/modules/module-itip-formatter.a
+lib/evolution/%%VERSION%%/modules/module-contact-photos.la
+lib/evolution/%%VERSION%%/modules/module-contact-photos.so
+lib/evolution/%%VERSION%%/modules/module-gravatar.la
+lib/evolution/%%VERSION%%/modules/module-gravatar.so
 lib/evolution/%%VERSION%%/modules/module-itip-formatter.la
 lib/evolution/%%VERSION%%/modules/module-itip-formatter.so
-lib/evolution/%%VERSION%%/modules/module-mail-config.a
 lib/evolution/%%VERSION%%/modules/module-mail-config.la
 lib/evolution/%%VERSION%%/modules/module-mail-config.so
-lib/evolution/%%VERSION%%/modules/module-mail.a
 lib/evolution/%%VERSION%%/modules/module-mail.la
 lib/evolution/%%VERSION%%/modules/module-mail.so
-lib/evolution/%%VERSION%%/modules/module-mailto-handler.a
 lib/evolution/%%VERSION%%/modules/module-mailto-handler.la
 lib/evolution/%%VERSION%%/modules/module-mailto-handler.so
-lib/evolution/%%VERSION%%/modules/module-mdn.a
 lib/evolution/%%VERSION%%/modules/module-mdn.la
 lib/evolution/%%VERSION%%/modules/module-mdn.so
-lib/evolution/%%VERSION%%/modules/module-offline-alert.a
 lib/evolution/%%VERSION%%/modules/module-offline-alert.la
 lib/evolution/%%VERSION%%/modules/module-offline-alert.so
-lib/evolution/%%VERSION%%/modules/module-online-accounts.a
-lib/evolution/%%VERSION%%/modules/module-online-accounts.la
-lib/evolution/%%VERSION%%/modules/module-online-accounts.so
-lib/evolution/%%VERSION%%/modules/module-plugin-lib.a
 lib/evolution/%%VERSION%%/modules/module-plugin-lib.la
 lib/evolution/%%VERSION%%/modules/module-plugin-lib.so
-lib/evolution/%%VERSION%%/modules/module-plugin-manager.a
 lib/evolution/%%VERSION%%/modules/module-plugin-manager.la
 lib/evolution/%%VERSION%%/modules/module-plugin-manager.so
-lib/evolution/%%VERSION%%/modules/module-prefer-plain.a
 lib/evolution/%%VERSION%%/modules/module-prefer-plain.la
 lib/evolution/%%VERSION%%/modules/module-prefer-plain.so
-lib/evolution/%%VERSION%%/modules/module-spamassassin.a
-lib/evolution/%%VERSION%%/modules/module-spamassassin.la
-lib/evolution/%%VERSION%%/modules/module-spamassassin.so
-lib/evolution/%%VERSION%%/modules/module-startup-wizard.a
+lib/evolution/%%VERSION%%/modules/module-settings.la
+lib/evolution/%%VERSION%%/modules/module-settings.so
+%%SPAMASSASSIN%%lib/evolution/%%VERSION%%/modules/module-spamassassin.la
+%%SPAMASSASSIN%%lib/evolution/%%VERSION%%/modules/module-spamassassin.so
 lib/evolution/%%VERSION%%/modules/module-startup-wizard.la
 lib/evolution/%%VERSION%%/modules/module-startup-wizard.so
-lib/evolution/%%VERSION%%/modules/module-text-highlight.a
 lib/evolution/%%VERSION%%/modules/module-text-highlight.la
 lib/evolution/%%VERSION%%/modules/module-text-highlight.so
-lib/evolution/%%VERSION%%/modules/module-vcard-inline.a
 lib/evolution/%%VERSION%%/modules/module-vcard-inline.la
 lib/evolution/%%VERSION%%/modules/module-vcard-inline.so
-lib/evolution/%%VERSION%%/modules/module-web-inspector.a
 lib/evolution/%%VERSION%%/modules/module-web-inspector.la
 lib/evolution/%%VERSION%%/modules/module-web-inspector.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-external-editor.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-external-editor.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-external-editor.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-itip-formatter.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
-%%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.a
 %%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.la
 %%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.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/org-gnome-dbx-import.eplug
@@ -662,7 +594,6 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-notification.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
 %%PST%%lib/evolution/%%VERSION%%/plugins/org-gnome-pst-import.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
@@ -670,55 +601,331 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug
 libdata/pkgconfig/evolution-calendar-3.0.pc
 libdata/pkgconfig/evolution-mail-3.0.pc
-libdata/pkgconfig/evolution-plugin-3.0.pc
 libdata/pkgconfig/evolution-shell-3.0.pc
 libdata/pkgconfig/libemail-engine.pc
-libdata/pkgconfig/libemail-utils.pc
-libdata/pkgconfig/libevolution-utils.pc
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
+share/GConf/gsettings/evolution.convert
+share/appdata/evolution.appdata.xml
 share/applications/evolution.desktop
-share/doc/eshell/EShell.html
-share/doc/eshell/EShellBackend.html
-share/doc/eshell/EShellContent.html
-share/doc/eshell/EShellSearchbar.html
-share/doc/eshell/EShellSettings.html
-share/doc/eshell/EShellSidebar.html
-share/doc/eshell/EShellSwitcher.html
-share/doc/eshell/EShellTaskbar.html
-share/doc/eshell/EShellView.html
-share/doc/eshell/EShellWindow.html
-share/doc/eshell/ch01.html
-share/doc/eshell/ch02.html
-share/doc/eshell/ch03.html
-share/doc/eshell/ch04.html
-share/doc/eshell/eshell-Action-Groups.html
-share/doc/eshell/eshell-Bit-Arrays-(Legacy).html
-share/doc/eshell/eshell-Categories.html
-share/doc/eshell/eshell-Date-and-Time-Formatting.html
-share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html
-share/doc/eshell/eshell-EPoolv.html
-share/doc/eshell/eshell-Icon-Utilities-(Legacy).html
-share/doc/eshell/eshell-Miscellaneous-Utilities.html
-share/doc/eshell/eshell-Printing.html
-share/doc/eshell/eshell-Reading-and-Writing-XML.html
-share/doc/eshell/eshell-Shell-Actions.html
-share/doc/eshell/eshell-Shell-Utilities.html
-share/doc/eshell/eshell-Text-to-HTML-Conversion.html
-share/doc/eshell/eshell-User-Alert-Handling.html
-share/doc/eshell/eshell-e-selection.html
-share/doc/eshell/eshell.devhelp2
-share/doc/eshell/home.png
-share/doc/eshell/index.html
-share/doc/eshell/index.sgml
-share/doc/eshell/ix01.html
-share/doc/eshell/left.png
-share/doc/eshell/right.png
-share/doc/eshell/style.css
-share/doc/eshell/up.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerActivity.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerFromHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerHeaderTable.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerNameHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerPostHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerSpellHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EComposerTextHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/EMsgComposer.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/evolution-mail-composer.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/home.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/index.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/left.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/right.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/style.css
+%%PORTDOCS%%%%DOCSDIR%%-mail-composer/up.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/CamelNullStore.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/CamelSaslXOAuth2.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMFilterFolderElement.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMVFolderContext.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMVFolderRule.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMailAuthenticator.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMailJunkFilter.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/EMailSession.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/MailFolderCache.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/evolution-mail-engine.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/home.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/index.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/left.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/right.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/style.css
+%%PORTDOCS%%%%DOCSDIR%%-mail-engine/up.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailExtensionRegistry.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailFormatter.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailFormatterExtension.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailFormatterPrint.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailFormatterQuote.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailInlineFilter.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailParser.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailParserExtension.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPart.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPartAttachment.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPartAttachmentBar.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPartHeaders.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPartImage.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailPartList.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/EMailStripSigFilter.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/evolution-mail-formatter.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/home.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/index.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/left.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/right.png
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/style.css
+%%PORTDOCS%%%%DOCSDIR%%-mail-formatter/up.png
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShell.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellBackend.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellContent.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellSearchbar.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellSidebar.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellSwitcher.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellTaskbar.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellView.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/EShellWindow.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/evolution-shell-Action-Groups.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/evolution-shell-Shell-Actions.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/evolution-shell-Shell-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/evolution-shell.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%-shell/home.png
+%%PORTDOCS%%%%DOCSDIR%%-shell/index.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%-shell/left.png
+%%PORTDOCS%%%%DOCSDIR%%-shell/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%-shell/right.png
+%%PORTDOCS%%%%DOCSDIR%%-shell/style.css
+%%PORTDOCS%%%%DOCSDIR%%-shell/up.png
+%%PORTDOCS%%%%DOCSDIR%%-util/EActionComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EActivity.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EActivityBar.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EActivityProxy.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAlarmSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAlert.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAlertBar.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAlertDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAlertSink.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachment.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentBar.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentButton.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentHandler.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentIconView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentPaned.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentStore.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentTreeView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAttachmentView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAuthComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EAutocompleteSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EBitArray.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EBookSourceConfig.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECalSourceConfig.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECalendar.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECalendarItem.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECanvas.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECanvasBackground.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECanvasVbox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECategoriesDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECategoriesEditor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECategoriesSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECategoryCompletion.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECategoryEditor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECell.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellCheckbox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellCombo.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellDate.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellDateEdit.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellHbox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellNumber.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellPercent.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellPixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellPopup.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellRendererColor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellSize.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellText.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellToggle.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellTree.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECellVbox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ECharsetComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EClientCache.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EClientComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EClientSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EConfig.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EContactStore.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EDataCapture.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EDestinationStore.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EEvent.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFileRequest.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterCode.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterColor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterDatespec.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterElement.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterFile.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterInput.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterInt.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterOption.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterPart.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFilterRule.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EFocusTracker.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EImageChooser.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EImport.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EImportAssistant.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EIntervalChooser.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EMap.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EMenuToolAction.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EMenuToolButton.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ENameSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ENameSelectorDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ENameSelectorEntry.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ENameSelectorList.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ENameSelectorModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EOnlineButton.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPaned.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPhotoCache.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPhotoSource.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPictureGallery.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPlugin.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPopupAction.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPortEntry.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPreferencesWindow.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPreviewPane.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EPrintable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EProxyComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EProxyEditor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EProxyLinkSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EProxyPreferences.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EProxySelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EReflow.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EReflowModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ERuleContext.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ERuleEditor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESearchBar.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESelectable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESelectionModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESelectionModelArray.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESelectionModelSimple.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESorter.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESorterArray.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESourceComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESourceConfig.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESourceConfigDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESourceSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESourceSelectorDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ESpellEntry.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EStockRequest.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableClickToAdd.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableCol.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableColumnSelector.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableColumnSpecification.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableConfig.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableExtras.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableFieldChooser.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableFieldChooserDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableFieldChooserItem.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableGroup.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableGroupLeaf.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableHeader.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableHeaderItem.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableItem.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSearch.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSelectionModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSortInfo.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSorted.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSorter.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSpecification.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableState.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETableSubset.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EText.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETextEventProcessor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETextEventProcessorEmacsLike.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETextModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETimezoneDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETree.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETreeModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETreeModelGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETreeSelectionModel.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETreeTableAdapter.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ETreeViewFrame.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EUrlEntry.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EWebView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EWebViewGtkHTML.html
+%%PORTDOCS%%%%DOCSDIR%%-util/EWebViewPreview.html
+%%PORTDOCS%%%%DOCSDIR%%-util/GalView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/GalViewCollection.html
+%%PORTDOCS%%%%DOCSDIR%%-util/GalViewEtable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/GalViewInstance.html
+%%PORTDOCS%%%%DOCSDIR%%-util/GalViewInstanceSaveAsDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%-util/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch06.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch07.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch08.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch09.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch10.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch11.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch12.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch13.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch14.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch15.html
+%%PORTDOCS%%%%DOCSDIR%%-util/ch16.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Canvas-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Category-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Date-and-Time-Formatting.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Dialog-Utilities-(Legacy).html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EDateEdit.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailIdentityComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignatureComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignatureEditor.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignatureManager.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignaturePreview.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignatureScriptDialog.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EMailSignatureTreeView.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EPluginUI.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-EPoolv.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ESendOptions.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ESource-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ESourceConfigBackend.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ETableGroupContainer.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ETableOne.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ETableSortedVariable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-ETableSubsetVariable.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-GtkTextBuffer-Tagging.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Icon-Utilities-(Legacy).html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Miscellaneous-Table-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Miscellaneous-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Password-Utilities-(Legacy).html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Popup-Menus-(Legacy).html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Printing.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Reading-and-Writing-XML.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Selections.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Sorting-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Text-to-HTML-Conversion.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-Unicode-Utilities.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util-e-spell-text-view.html
+%%PORTDOCS%%%%DOCSDIR%%-util/evolution-util.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%-util/home.png
+%%PORTDOCS%%%%DOCSDIR%%-util/index.html
+%%PORTDOCS%%%%DOCSDIR%%-util/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%-util/left.png
+%%PORTDOCS%%%%DOCSDIR%%-util/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%-util/right.png
+%%PORTDOCS%%%%DOCSDIR%%-util/style.css
+%%PORTDOCS%%%%DOCSDIR%%-util/up.png
 %%DATADIR%%/%%VERSION%%/address_formats.dat
 %%DATADIR%%/%%VERSION%%/addresstypes.xml
 %%DATADIR%%/%%VERSION%%/caltypes.xml
@@ -961,8 +1168,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/ui/e-send-options.ui
 %%DATADIR%%/%%VERSION%%/ui/e-table-config.ui
 %%DATADIR%%/%%VERSION%%/ui/e-timezone-dialog.ui
-%%DATADIR%%/%%VERSION%%/ui/eab-contact-commit-duplicate-detected.ui
-%%DATADIR%%/%%VERSION%%/ui/eab-contact-duplicate-detected.ui
 %%DATADIR%%/%%VERSION%%/ui/event-page.ui
 %%DATADIR%%/%%VERSION%%/ui/evolution-calendars.ui
 %%DATADIR%%/%%VERSION%%/ui/evolution-composer.ui
@@ -974,11 +1179,8 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/ui/evolution-tasks.ui
 %%DATADIR%%/%%VERSION%%/ui/filter.ui
 %%DATADIR%%/%%VERSION%%/ui/fullname.ui
-%%DATADIR%%/%%VERSION%%/ui/gal-define-views.ui
 %%DATADIR%%/%%VERSION%%/ui/gal-view-instance-save-as-dialog.ui
-%%DATADIR%%/%%VERSION%%/ui/gal-view-new-dialog.ui
 %%DATADIR%%/%%VERSION%%/ui/goto-dialog.ui
-%%DATADIR%%/%%VERSION%%/ui/ldap-config.ui
 %%DATADIR%%/%%VERSION%%/ui/mail-config.ui
 %%DATADIR%%/%%VERSION%%/ui/mail-dialogs.ui
 %%DATADIR%%/%%VERSION%%/ui/memo-page.ui
@@ -987,7 +1189,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/ui/recurrence-page.ui
 %%DATADIR%%/%%VERSION%%/ui/schedule-page.ui
 %%DATADIR%%/%%VERSION%%/ui/smime-ui.ui
-%%DATADIR%%/%%VERSION%%/ui/task-details-page.ui
 %%DATADIR%%/%%VERSION%%/ui/task-page.ui
 %%DATADIR%%/%%VERSION%%/vfoldertypes.xml
 %%DATADIR%%/%%VERSION%%/views/addressbook/Address_Cards.galview
@@ -1011,27 +1212,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/views/tasks/With_DueDate.galview
 %%DATADIR%%/%%VERSION%%/views/tasks/With_Status.galview
 %%DATADIR%%/%%VERSION%%/views/tasks/galview.xml
-share/icons/hicolor/16x16/apps/evolution-mail.png
-share/icons/hicolor/16x16/apps/evolution-memos.png
-share/icons/hicolor/16x16/apps/evolution-tasks.png
-share/icons/hicolor/16x16/apps/evolution.png
-share/icons/hicolor/22x22/apps/evolution-mail.png
-share/icons/hicolor/22x22/apps/evolution-memos.png
-share/icons/hicolor/22x22/apps/evolution-tasks.png
-share/icons/hicolor/22x22/apps/evolution.png
-share/icons/hicolor/24x24/apps/evolution-mail.png
-share/icons/hicolor/24x24/apps/evolution-memos.png
-share/icons/hicolor/24x24/apps/evolution-tasks.png
-share/icons/hicolor/24x24/apps/evolution.png
-share/icons/hicolor/256x256/apps/evolution.png
-share/icons/hicolor/32x32/apps/evolution-mail.png
-share/icons/hicolor/32x32/apps/evolution-memos.png
-share/icons/hicolor/32x32/apps/evolution-tasks.png
-share/icons/hicolor/32x32/apps/evolution.png
-share/icons/hicolor/48x48/apps/evolution-mail.png
-share/icons/hicolor/48x48/apps/evolution-memos.png
-share/icons/hicolor/48x48/apps/evolution-tasks.png
-share/icons/hicolor/48x48/apps/evolution.png
 share/help/C/evolution/backup-restore.page
 share/help/C/evolution/calendar-alarms-and-reminders.page
 share/help/C/evolution/calendar-caldav.page
@@ -1061,7 +1241,6 @@ share/help/C/evolution/calendar-usage.page
 share/help/C/evolution/calendar-using-several-calendars.page
 share/help/C/evolution/calendar-weather.page
 share/help/C/evolution/calendar-webdav.page
-share/help/C/evolution/change-keyboard-shortcuts.page
 share/help/C/evolution/change-switcher-appearance.page
 share/help/C/evolution/contacts-add-automatically.page
 share/help/C/evolution/contacts-autocompletion.page
@@ -1089,7 +1268,6 @@ share/help/C/evolution/exporting-data-calendar.page
 share/help/C/evolution/exporting-data-contacts.page
 share/help/C/evolution/exporting-data-mail.page
 share/help/C/evolution/exporting-data.page
-share/help/C/evolution/express-mode.page
 share/help/C/evolution/figures/color-000000.png
 share/help/C/evolution/figures/color-204a87.png
 share/help/C/evolution/figures/color-2e3436.png
@@ -1111,7 +1289,6 @@ share/help/C/evolution/figures/plus-icon.png
 share/help/C/evolution/figures/search-icon.png
 share/help/C/evolution/figures/window-overview-layers.png
 share/help/C/evolution/google-services.page
-share/help/C/evolution/groupwise-placeholder.page
 share/help/C/evolution/import-apps-mozilla.page
 share/help/C/evolution/import-apps-outlook.page
 share/help/C/evolution/import-data.page
@@ -1121,18 +1298,16 @@ share/help/C/evolution/index.page
 share/help/C/evolution/intro-application.page
 share/help/C/evolution/intro-first-run.page
 share/help/C/evolution/intro-main-window.page
+share/help/C/evolution/legal.xml
 share/help/C/evolution/mail-access-gmail-imap-account.page
 share/help/C/evolution/mail-access-gmail-pop-account.page
 share/help/C/evolution/mail-account-manage-imap-plus.page
-share/help/C/evolution/mail-account-manage-imap.page
 share/help/C/evolution/mail-account-manage-local-delivery.page
 share/help/C/evolution/mail-account-manage-maildir-format-directories.page
 share/help/C/evolution/mail-account-manage-mh-format-directories.page
 share/help/C/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/C/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/C/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/C/evolution/mail-account-manage-microsoft-exchange.page
-share/help/C/evolution/mail-account-manage-novell-groupwise.page
 share/help/C/evolution/mail-account-manage-pop.page
 share/help/C/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/C/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -1178,7 +1353,6 @@ share/help/C/evolution/mail-displaying-character-encodings.page
 share/help/C/evolution/mail-displaying-collapsible-headers.page
 share/help/C/evolution/mail-displaying-images-in-html.page
 share/help/C/evolution/mail-displaying-message.page
-share/help/C/evolution/mail-displaying-no-css.page
 share/help/C/evolution/mail-displaying-sender-photograph.page
 share/help/C/evolution/mail-duplicates.page
 share/help/C/evolution/mail-encryption-gpg-create-key.page
@@ -1189,15 +1363,12 @@ share/help/C/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/C/evolution/mail-encryption-s-mime-manage.page
 share/help/C/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/C/evolution/mail-encryption.page
-share/help/C/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/C/evolution/mail-error-no-provider-available.page
 share/help/C/evolution/mail-filters-actions.page
 share/help/C/evolution/mail-filters-conditions.page
 share/help/C/evolution/mail-filters-not-working.page
 share/help/C/evolution/mail-filters.page
 share/help/C/evolution/mail-folders.page
 share/help/C/evolution/mail-follow-up-flag.page
-share/help/C/evolution/mail-imap-headers.page
 share/help/C/evolution/mail-imap-subscriptions.page
 share/help/C/evolution/mail-labels.page
 share/help/C/evolution/mail-layout-changing.page
@@ -1208,15 +1379,12 @@ share/help/C/evolution/mail-organizing.page
 share/help/C/evolution/mail-read-receipts.page
 share/help/C/evolution/mail-reading-keyboard-shortcuts.page
 share/help/C/evolution/mail-received-notification.page
-share/help/C/evolution/mail-receiving-options-evolution-exchange.page
 share/help/C/evolution/mail-receiving-options-exchange-ews.page
 share/help/C/evolution/mail-receiving-options-exchange-mapi.page
 share/help/C/evolution/mail-receiving-options-imap-plus.page
-share/help/C/evolution/mail-receiving-options-imap.page
 share/help/C/evolution/mail-receiving-options-local-delivery.page
 share/help/C/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/C/evolution/mail-receiving-options-mh-format-directories.page
-share/help/C/evolution/mail-receiving-options-novell-groupwise.page
 share/help/C/evolution/mail-receiving-options-pop.page
 share/help/C/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/C/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -1271,6 +1439,9 @@ share/help/C/evolution/tasks-usage.page
 share/help/C/evolution/tasks-using-several-tasklists.page
 share/help/C/evolution/tasks-webdav.page
 share/help/C/evolution/using-categories.page
+share/help/C/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/C/evolution/xinclude-mail-account-identity.xml
+share/help/C/evolution/xinclude-searching.xml
 share/help/cs/evolution/backup-restore.page
 share/help/cs/evolution/calendar-alarms-and-reminders.page
 share/help/cs/evolution/calendar-caldav.page
@@ -1300,7 +1471,6 @@ share/help/cs/evolution/calendar-usage.page
 share/help/cs/evolution/calendar-using-several-calendars.page
 share/help/cs/evolution/calendar-weather.page
 share/help/cs/evolution/calendar-webdav.page
-share/help/cs/evolution/change-keyboard-shortcuts.page
 share/help/cs/evolution/change-switcher-appearance.page
 share/help/cs/evolution/contacts-add-automatically.page
 share/help/cs/evolution/contacts-autocompletion.page
@@ -1328,7 +1498,6 @@ share/help/cs/evolution/exporting-data-calendar.page
 share/help/cs/evolution/exporting-data-contacts.page
 share/help/cs/evolution/exporting-data-mail.page
 share/help/cs/evolution/exporting-data.page
-share/help/cs/evolution/express-mode.page
 share/help/cs/evolution/figures/color-000000.png
 share/help/cs/evolution/figures/color-204a87.png
 share/help/cs/evolution/figures/color-2e3436.png
@@ -1350,7 +1519,6 @@ share/help/cs/evolution/figures/plus-icon.png
 share/help/cs/evolution/figures/search-icon.png
 share/help/cs/evolution/figures/window-overview-layers.png
 share/help/cs/evolution/google-services.page
-share/help/cs/evolution/groupwise-placeholder.page
 share/help/cs/evolution/import-apps-mozilla.page
 share/help/cs/evolution/import-apps-outlook.page
 share/help/cs/evolution/import-data.page
@@ -1360,18 +1528,16 @@ share/help/cs/evolution/index.page
 share/help/cs/evolution/intro-application.page
 share/help/cs/evolution/intro-first-run.page
 share/help/cs/evolution/intro-main-window.page
+share/help/cs/evolution/legal.xml
 share/help/cs/evolution/mail-access-gmail-imap-account.page
 share/help/cs/evolution/mail-access-gmail-pop-account.page
 share/help/cs/evolution/mail-account-manage-imap-plus.page
-share/help/cs/evolution/mail-account-manage-imap.page
 share/help/cs/evolution/mail-account-manage-local-delivery.page
 share/help/cs/evolution/mail-account-manage-maildir-format-directories.page
 share/help/cs/evolution/mail-account-manage-mh-format-directories.page
 share/help/cs/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/cs/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/cs/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/cs/evolution/mail-account-manage-microsoft-exchange.page
-share/help/cs/evolution/mail-account-manage-novell-groupwise.page
 share/help/cs/evolution/mail-account-manage-pop.page
 share/help/cs/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/cs/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -1417,7 +1583,6 @@ share/help/cs/evolution/mail-displaying-character-encodings.page
 share/help/cs/evolution/mail-displaying-collapsible-headers.page
 share/help/cs/evolution/mail-displaying-images-in-html.page
 share/help/cs/evolution/mail-displaying-message.page
-share/help/cs/evolution/mail-displaying-no-css.page
 share/help/cs/evolution/mail-displaying-sender-photograph.page
 share/help/cs/evolution/mail-duplicates.page
 share/help/cs/evolution/mail-encryption-gpg-create-key.page
@@ -1428,15 +1593,12 @@ share/help/cs/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/cs/evolution/mail-encryption-s-mime-manage.page
 share/help/cs/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/cs/evolution/mail-encryption.page
-share/help/cs/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/cs/evolution/mail-error-no-provider-available.page
 share/help/cs/evolution/mail-filters-actions.page
 share/help/cs/evolution/mail-filters-conditions.page
 share/help/cs/evolution/mail-filters-not-working.page
 share/help/cs/evolution/mail-filters.page
 share/help/cs/evolution/mail-folders.page
 share/help/cs/evolution/mail-follow-up-flag.page
-share/help/cs/evolution/mail-imap-headers.page
 share/help/cs/evolution/mail-imap-subscriptions.page
 share/help/cs/evolution/mail-labels.page
 share/help/cs/evolution/mail-layout-changing.page
@@ -1447,15 +1609,12 @@ share/help/cs/evolution/mail-organizing.page
 share/help/cs/evolution/mail-read-receipts.page
 share/help/cs/evolution/mail-reading-keyboard-shortcuts.page
 share/help/cs/evolution/mail-received-notification.page
-share/help/cs/evolution/mail-receiving-options-evolution-exchange.page
 share/help/cs/evolution/mail-receiving-options-exchange-ews.page
 share/help/cs/evolution/mail-receiving-options-exchange-mapi.page
 share/help/cs/evolution/mail-receiving-options-imap-plus.page
-share/help/cs/evolution/mail-receiving-options-imap.page
 share/help/cs/evolution/mail-receiving-options-local-delivery.page
 share/help/cs/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/cs/evolution/mail-receiving-options-mh-format-directories.page
-share/help/cs/evolution/mail-receiving-options-novell-groupwise.page
 share/help/cs/evolution/mail-receiving-options-pop.page
 share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -1510,6 +1669,9 @@ share/help/cs/evolution/tasks-usage.page
 share/help/cs/evolution/tasks-using-several-tasklists.page
 share/help/cs/evolution/tasks-webdav.page
 share/help/cs/evolution/using-categories.page
+share/help/cs/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/cs/evolution/xinclude-mail-account-identity.xml
+share/help/cs/evolution/xinclude-searching.xml
 share/help/de/evolution/backup-restore.page
 share/help/de/evolution/calendar-alarms-and-reminders.page
 share/help/de/evolution/calendar-caldav.page
@@ -1539,7 +1701,6 @@ share/help/de/evolution/calendar-usage.page
 share/help/de/evolution/calendar-using-several-calendars.page
 share/help/de/evolution/calendar-weather.page
 share/help/de/evolution/calendar-webdav.page
-share/help/de/evolution/change-keyboard-shortcuts.page
 share/help/de/evolution/change-switcher-appearance.page
 share/help/de/evolution/contacts-add-automatically.page
 share/help/de/evolution/contacts-autocompletion.page
@@ -1567,7 +1728,6 @@ share/help/de/evolution/exporting-data-calendar.page
 share/help/de/evolution/exporting-data-contacts.page
 share/help/de/evolution/exporting-data-mail.page
 share/help/de/evolution/exporting-data.page
-share/help/de/evolution/express-mode.page
 share/help/de/evolution/figures/color-000000.png
 share/help/de/evolution/figures/color-204a87.png
 share/help/de/evolution/figures/color-2e3436.png
@@ -1589,7 +1749,6 @@ share/help/de/evolution/figures/plus-icon.png
 share/help/de/evolution/figures/search-icon.png
 share/help/de/evolution/figures/window-overview-layers.png
 share/help/de/evolution/google-services.page
-share/help/de/evolution/groupwise-placeholder.page
 share/help/de/evolution/import-apps-mozilla.page
 share/help/de/evolution/import-apps-outlook.page
 share/help/de/evolution/import-data.page
@@ -1599,18 +1758,16 @@ share/help/de/evolution/index.page
 share/help/de/evolution/intro-application.page
 share/help/de/evolution/intro-first-run.page
 share/help/de/evolution/intro-main-window.page
+share/help/de/evolution/legal.xml
 share/help/de/evolution/mail-access-gmail-imap-account.page
 share/help/de/evolution/mail-access-gmail-pop-account.page
 share/help/de/evolution/mail-account-manage-imap-plus.page
-share/help/de/evolution/mail-account-manage-imap.page
 share/help/de/evolution/mail-account-manage-local-delivery.page
 share/help/de/evolution/mail-account-manage-maildir-format-directories.page
 share/help/de/evolution/mail-account-manage-mh-format-directories.page
 share/help/de/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/de/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/de/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/de/evolution/mail-account-manage-microsoft-exchange.page
-share/help/de/evolution/mail-account-manage-novell-groupwise.page
 share/help/de/evolution/mail-account-manage-pop.page
 share/help/de/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/de/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -1656,7 +1813,6 @@ share/help/de/evolution/mail-displaying-character-encodings.page
 share/help/de/evolution/mail-displaying-collapsible-headers.page
 share/help/de/evolution/mail-displaying-images-in-html.page
 share/help/de/evolution/mail-displaying-message.page
-share/help/de/evolution/mail-displaying-no-css.page
 share/help/de/evolution/mail-displaying-sender-photograph.page
 share/help/de/evolution/mail-duplicates.page
 share/help/de/evolution/mail-encryption-gpg-create-key.page
@@ -1667,15 +1823,12 @@ share/help/de/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/de/evolution/mail-encryption-s-mime-manage.page
 share/help/de/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/de/evolution/mail-encryption.page
-share/help/de/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/de/evolution/mail-error-no-provider-available.page
 share/help/de/evolution/mail-filters-actions.page
 share/help/de/evolution/mail-filters-conditions.page
 share/help/de/evolution/mail-filters-not-working.page
 share/help/de/evolution/mail-filters.page
 share/help/de/evolution/mail-folders.page
 share/help/de/evolution/mail-follow-up-flag.page
-share/help/de/evolution/mail-imap-headers.page
 share/help/de/evolution/mail-imap-subscriptions.page
 share/help/de/evolution/mail-labels.page
 share/help/de/evolution/mail-layout-changing.page
@@ -1686,15 +1839,12 @@ share/help/de/evolution/mail-organizing.page
 share/help/de/evolution/mail-read-receipts.page
 share/help/de/evolution/mail-reading-keyboard-shortcuts.page
 share/help/de/evolution/mail-received-notification.page
-share/help/de/evolution/mail-receiving-options-evolution-exchange.page
 share/help/de/evolution/mail-receiving-options-exchange-ews.page
 share/help/de/evolution/mail-receiving-options-exchange-mapi.page
 share/help/de/evolution/mail-receiving-options-imap-plus.page
-share/help/de/evolution/mail-receiving-options-imap.page
 share/help/de/evolution/mail-receiving-options-local-delivery.page
 share/help/de/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/de/evolution/mail-receiving-options-mh-format-directories.page
-share/help/de/evolution/mail-receiving-options-novell-groupwise.page
 share/help/de/evolution/mail-receiving-options-pop.page
 share/help/de/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/de/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -1749,6 +1899,9 @@ share/help/de/evolution/tasks-usage.page
 share/help/de/evolution/tasks-using-several-tasklists.page
 share/help/de/evolution/tasks-webdav.page
 share/help/de/evolution/using-categories.page
+share/help/de/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/de/evolution/xinclude-mail-account-identity.xml
+share/help/de/evolution/xinclude-searching.xml
 share/help/el/evolution/backup-restore.page
 share/help/el/evolution/calendar-alarms-and-reminders.page
 share/help/el/evolution/calendar-caldav.page
@@ -1778,7 +1931,6 @@ share/help/el/evolution/calendar-usage.page
 share/help/el/evolution/calendar-using-several-calendars.page
 share/help/el/evolution/calendar-weather.page
 share/help/el/evolution/calendar-webdav.page
-share/help/el/evolution/change-keyboard-shortcuts.page
 share/help/el/evolution/change-switcher-appearance.page
 share/help/el/evolution/contacts-add-automatically.page
 share/help/el/evolution/contacts-autocompletion.page
@@ -1806,7 +1958,6 @@ share/help/el/evolution/exporting-data-calendar.page
 share/help/el/evolution/exporting-data-contacts.page
 share/help/el/evolution/exporting-data-mail.page
 share/help/el/evolution/exporting-data.page
-share/help/el/evolution/express-mode.page
 share/help/el/evolution/figures/color-000000.png
 share/help/el/evolution/figures/color-204a87.png
 share/help/el/evolution/figures/color-2e3436.png
@@ -1828,7 +1979,6 @@ share/help/el/evolution/figures/plus-icon.png
 share/help/el/evolution/figures/search-icon.png
 share/help/el/evolution/figures/window-overview-layers.png
 share/help/el/evolution/google-services.page
-share/help/el/evolution/groupwise-placeholder.page
 share/help/el/evolution/import-apps-mozilla.page
 share/help/el/evolution/import-apps-outlook.page
 share/help/el/evolution/import-data.page
@@ -1838,18 +1988,16 @@ share/help/el/evolution/index.page
 share/help/el/evolution/intro-application.page
 share/help/el/evolution/intro-first-run.page
 share/help/el/evolution/intro-main-window.page
+share/help/el/evolution/legal.xml
 share/help/el/evolution/mail-access-gmail-imap-account.page
 share/help/el/evolution/mail-access-gmail-pop-account.page
 share/help/el/evolution/mail-account-manage-imap-plus.page
-share/help/el/evolution/mail-account-manage-imap.page
 share/help/el/evolution/mail-account-manage-local-delivery.page
 share/help/el/evolution/mail-account-manage-maildir-format-directories.page
 share/help/el/evolution/mail-account-manage-mh-format-directories.page
 share/help/el/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/el/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/el/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/el/evolution/mail-account-manage-microsoft-exchange.page
-share/help/el/evolution/mail-account-manage-novell-groupwise.page
 share/help/el/evolution/mail-account-manage-pop.page
 share/help/el/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/el/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -1895,7 +2043,6 @@ share/help/el/evolution/mail-displaying-character-encodings.page
 share/help/el/evolution/mail-displaying-collapsible-headers.page
 share/help/el/evolution/mail-displaying-images-in-html.page
 share/help/el/evolution/mail-displaying-message.page
-share/help/el/evolution/mail-displaying-no-css.page
 share/help/el/evolution/mail-displaying-sender-photograph.page
 share/help/el/evolution/mail-duplicates.page
 share/help/el/evolution/mail-encryption-gpg-create-key.page
@@ -1906,15 +2053,12 @@ share/help/el/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/el/evolution/mail-encryption-s-mime-manage.page
 share/help/el/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/el/evolution/mail-encryption.page
-share/help/el/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/el/evolution/mail-error-no-provider-available.page
 share/help/el/evolution/mail-filters-actions.page
 share/help/el/evolution/mail-filters-conditions.page
 share/help/el/evolution/mail-filters-not-working.page
 share/help/el/evolution/mail-filters.page
 share/help/el/evolution/mail-folders.page
 share/help/el/evolution/mail-follow-up-flag.page
-share/help/el/evolution/mail-imap-headers.page
 share/help/el/evolution/mail-imap-subscriptions.page
 share/help/el/evolution/mail-labels.page
 share/help/el/evolution/mail-layout-changing.page
@@ -1925,15 +2069,12 @@ share/help/el/evolution/mail-organizing.page
 share/help/el/evolution/mail-read-receipts.page
 share/help/el/evolution/mail-reading-keyboard-shortcuts.page
 share/help/el/evolution/mail-received-notification.page
-share/help/el/evolution/mail-receiving-options-evolution-exchange.page
 share/help/el/evolution/mail-receiving-options-exchange-ews.page
 share/help/el/evolution/mail-receiving-options-exchange-mapi.page
 share/help/el/evolution/mail-receiving-options-imap-plus.page
-share/help/el/evolution/mail-receiving-options-imap.page
 share/help/el/evolution/mail-receiving-options-local-delivery.page
 share/help/el/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/el/evolution/mail-receiving-options-mh-format-directories.page
-share/help/el/evolution/mail-receiving-options-novell-groupwise.page
 share/help/el/evolution/mail-receiving-options-pop.page
 share/help/el/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/el/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -1988,6 +2129,9 @@ share/help/el/evolution/tasks-usage.page
 share/help/el/evolution/tasks-using-several-tasklists.page
 share/help/el/evolution/tasks-webdav.page
 share/help/el/evolution/using-categories.page
+share/help/el/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/el/evolution/xinclude-mail-account-identity.xml
+share/help/el/evolution/xinclude-searching.xml
 share/help/en_GB/evolution/backup-restore.page
 share/help/en_GB/evolution/calendar-alarms-and-reminders.page
 share/help/en_GB/evolution/calendar-caldav.page
@@ -2017,7 +2161,6 @@ share/help/en_GB/evolution/calendar-usage.page
 share/help/en_GB/evolution/calendar-using-several-calendars.page
 share/help/en_GB/evolution/calendar-weather.page
 share/help/en_GB/evolution/calendar-webdav.page
-share/help/en_GB/evolution/change-keyboard-shortcuts.page
 share/help/en_GB/evolution/change-switcher-appearance.page
 share/help/en_GB/evolution/contacts-add-automatically.page
 share/help/en_GB/evolution/contacts-autocompletion.page
@@ -2045,7 +2188,6 @@ share/help/en_GB/evolution/exporting-data-calendar.page
 share/help/en_GB/evolution/exporting-data-contacts.page
 share/help/en_GB/evolution/exporting-data-mail.page
 share/help/en_GB/evolution/exporting-data.page
-share/help/en_GB/evolution/express-mode.page
 share/help/en_GB/evolution/figures/color-000000.png
 share/help/en_GB/evolution/figures/color-204a87.png
 share/help/en_GB/evolution/figures/color-2e3436.png
@@ -2067,7 +2209,6 @@ share/help/en_GB/evolution/figures/plus-icon.png
 share/help/en_GB/evolution/figures/search-icon.png
 share/help/en_GB/evolution/figures/window-overview-layers.png
 share/help/en_GB/evolution/google-services.page
-share/help/en_GB/evolution/groupwise-placeholder.page
 share/help/en_GB/evolution/import-apps-mozilla.page
 share/help/en_GB/evolution/import-apps-outlook.page
 share/help/en_GB/evolution/import-data.page
@@ -2077,18 +2218,16 @@ share/help/en_GB/evolution/index.page
 share/help/en_GB/evolution/intro-application.page
 share/help/en_GB/evolution/intro-first-run.page
 share/help/en_GB/evolution/intro-main-window.page
+share/help/en_GB/evolution/legal.xml
 share/help/en_GB/evolution/mail-access-gmail-imap-account.page
 share/help/en_GB/evolution/mail-access-gmail-pop-account.page
 share/help/en_GB/evolution/mail-account-manage-imap-plus.page
-share/help/en_GB/evolution/mail-account-manage-imap.page
 share/help/en_GB/evolution/mail-account-manage-local-delivery.page
 share/help/en_GB/evolution/mail-account-manage-maildir-format-directories.page
 share/help/en_GB/evolution/mail-account-manage-mh-format-directories.page
 share/help/en_GB/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/en_GB/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/en_GB/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/en_GB/evolution/mail-account-manage-microsoft-exchange.page
-share/help/en_GB/evolution/mail-account-manage-novell-groupwise.page
 share/help/en_GB/evolution/mail-account-manage-pop.page
 share/help/en_GB/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/en_GB/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -2134,7 +2273,6 @@ share/help/en_GB/evolution/mail-displaying-character-encodings.page
 share/help/en_GB/evolution/mail-displaying-collapsible-headers.page
 share/help/en_GB/evolution/mail-displaying-images-in-html.page
 share/help/en_GB/evolution/mail-displaying-message.page
-share/help/en_GB/evolution/mail-displaying-no-css.page
 share/help/en_GB/evolution/mail-displaying-sender-photograph.page
 share/help/en_GB/evolution/mail-duplicates.page
 share/help/en_GB/evolution/mail-encryption-gpg-create-key.page
@@ -2145,15 +2283,12 @@ share/help/en_GB/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/en_GB/evolution/mail-encryption-s-mime-manage.page
 share/help/en_GB/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/en_GB/evolution/mail-encryption.page
-share/help/en_GB/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/en_GB/evolution/mail-error-no-provider-available.page
 share/help/en_GB/evolution/mail-filters-actions.page
 share/help/en_GB/evolution/mail-filters-conditions.page
 share/help/en_GB/evolution/mail-filters-not-working.page
 share/help/en_GB/evolution/mail-filters.page
 share/help/en_GB/evolution/mail-folders.page
 share/help/en_GB/evolution/mail-follow-up-flag.page
-share/help/en_GB/evolution/mail-imap-headers.page
 share/help/en_GB/evolution/mail-imap-subscriptions.page
 share/help/en_GB/evolution/mail-labels.page
 share/help/en_GB/evolution/mail-layout-changing.page
@@ -2164,15 +2299,12 @@ share/help/en_GB/evolution/mail-organizing.page
 share/help/en_GB/evolution/mail-read-receipts.page
 share/help/en_GB/evolution/mail-reading-keyboard-shortcuts.page
 share/help/en_GB/evolution/mail-received-notification.page
-share/help/en_GB/evolution/mail-receiving-options-evolution-exchange.page
 share/help/en_GB/evolution/mail-receiving-options-exchange-ews.page
 share/help/en_GB/evolution/mail-receiving-options-exchange-mapi.page
 share/help/en_GB/evolution/mail-receiving-options-imap-plus.page
-share/help/en_GB/evolution/mail-receiving-options-imap.page
 share/help/en_GB/evolution/mail-receiving-options-local-delivery.page
 share/help/en_GB/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/en_GB/evolution/mail-receiving-options-mh-format-directories.page
-share/help/en_GB/evolution/mail-receiving-options-novell-groupwise.page
 share/help/en_GB/evolution/mail-receiving-options-pop.page
 share/help/en_GB/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/en_GB/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -2227,6 +2359,9 @@ share/help/en_GB/evolution/tasks-usage.page
 share/help/en_GB/evolution/tasks-using-several-tasklists.page
 share/help/en_GB/evolution/tasks-webdav.page
 share/help/en_GB/evolution/using-categories.page
+share/help/en_GB/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/en_GB/evolution/xinclude-mail-account-identity.xml
+share/help/en_GB/evolution/xinclude-searching.xml
 share/help/es/evolution/backup-restore.page
 share/help/es/evolution/calendar-alarms-and-reminders.page
 share/help/es/evolution/calendar-caldav.page
@@ -2256,7 +2391,6 @@ share/help/es/evolution/calendar-usage.page
 share/help/es/evolution/calendar-using-several-calendars.page
 share/help/es/evolution/calendar-weather.page
 share/help/es/evolution/calendar-webdav.page
-share/help/es/evolution/change-keyboard-shortcuts.page
 share/help/es/evolution/change-switcher-appearance.page
 share/help/es/evolution/contacts-add-automatically.page
 share/help/es/evolution/contacts-autocompletion.page
@@ -2284,7 +2418,6 @@ share/help/es/evolution/exporting-data-calendar.page
 share/help/es/evolution/exporting-data-contacts.page
 share/help/es/evolution/exporting-data-mail.page
 share/help/es/evolution/exporting-data.page
-share/help/es/evolution/express-mode.page
 share/help/es/evolution/figures/color-000000.png
 share/help/es/evolution/figures/color-204a87.png
 share/help/es/evolution/figures/color-2e3436.png
@@ -2306,7 +2439,6 @@ share/help/es/evolution/figures/plus-icon.png
 share/help/es/evolution/figures/search-icon.png
 share/help/es/evolution/figures/window-overview-layers.png
 share/help/es/evolution/google-services.page
-share/help/es/evolution/groupwise-placeholder.page
 share/help/es/evolution/import-apps-mozilla.page
 share/help/es/evolution/import-apps-outlook.page
 share/help/es/evolution/import-data.page
@@ -2316,18 +2448,16 @@ share/help/es/evolution/index.page
 share/help/es/evolution/intro-application.page
 share/help/es/evolution/intro-first-run.page
 share/help/es/evolution/intro-main-window.page
+share/help/es/evolution/legal.xml
 share/help/es/evolution/mail-access-gmail-imap-account.page
 share/help/es/evolution/mail-access-gmail-pop-account.page
 share/help/es/evolution/mail-account-manage-imap-plus.page
-share/help/es/evolution/mail-account-manage-imap.page
 share/help/es/evolution/mail-account-manage-local-delivery.page
 share/help/es/evolution/mail-account-manage-maildir-format-directories.page
 share/help/es/evolution/mail-account-manage-mh-format-directories.page
 share/help/es/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/es/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/es/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/es/evolution/mail-account-manage-microsoft-exchange.page
-share/help/es/evolution/mail-account-manage-novell-groupwise.page
 share/help/es/evolution/mail-account-manage-pop.page
 share/help/es/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/es/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -2373,7 +2503,6 @@ share/help/es/evolution/mail-displaying-character-encodings.page
 share/help/es/evolution/mail-displaying-collapsible-headers.page
 share/help/es/evolution/mail-displaying-images-in-html.page
 share/help/es/evolution/mail-displaying-message.page
-share/help/es/evolution/mail-displaying-no-css.page
 share/help/es/evolution/mail-displaying-sender-photograph.page
 share/help/es/evolution/mail-duplicates.page
 share/help/es/evolution/mail-encryption-gpg-create-key.page
@@ -2384,15 +2513,12 @@ share/help/es/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/es/evolution/mail-encryption-s-mime-manage.page
 share/help/es/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/es/evolution/mail-encryption.page
-share/help/es/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/es/evolution/mail-error-no-provider-available.page
 share/help/es/evolution/mail-filters-actions.page
 share/help/es/evolution/mail-filters-conditions.page
 share/help/es/evolution/mail-filters-not-working.page
 share/help/es/evolution/mail-filters.page
 share/help/es/evolution/mail-folders.page
 share/help/es/evolution/mail-follow-up-flag.page
-share/help/es/evolution/mail-imap-headers.page
 share/help/es/evolution/mail-imap-subscriptions.page
 share/help/es/evolution/mail-labels.page
 share/help/es/evolution/mail-layout-changing.page
@@ -2403,15 +2529,12 @@ share/help/es/evolution/mail-organizing.page
 share/help/es/evolution/mail-read-receipts.page
 share/help/es/evolution/mail-reading-keyboard-shortcuts.page
 share/help/es/evolution/mail-received-notification.page
-share/help/es/evolution/mail-receiving-options-evolution-exchange.page
 share/help/es/evolution/mail-receiving-options-exchange-ews.page
 share/help/es/evolution/mail-receiving-options-exchange-mapi.page
 share/help/es/evolution/mail-receiving-options-imap-plus.page
-share/help/es/evolution/mail-receiving-options-imap.page
 share/help/es/evolution/mail-receiving-options-local-delivery.page
 share/help/es/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/es/evolution/mail-receiving-options-mh-format-directories.page
-share/help/es/evolution/mail-receiving-options-novell-groupwise.page
 share/help/es/evolution/mail-receiving-options-pop.page
 share/help/es/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/es/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -2466,6 +2589,9 @@ share/help/es/evolution/tasks-usage.page
 share/help/es/evolution/tasks-using-several-tasklists.page
 share/help/es/evolution/tasks-webdav.page
 share/help/es/evolution/using-categories.page
+share/help/es/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/es/evolution/xinclude-mail-account-identity.xml
+share/help/es/evolution/xinclude-searching.xml
 share/help/eu/evolution/backup-restore.page
 share/help/eu/evolution/calendar-alarms-and-reminders.page
 share/help/eu/evolution/calendar-caldav.page
@@ -2495,7 +2621,6 @@ share/help/eu/evolution/calendar-usage.page
 share/help/eu/evolution/calendar-using-several-calendars.page
 share/help/eu/evolution/calendar-weather.page
 share/help/eu/evolution/calendar-webdav.page
-share/help/eu/evolution/change-keyboard-shortcuts.page
 share/help/eu/evolution/change-switcher-appearance.page
 share/help/eu/evolution/contacts-add-automatically.page
 share/help/eu/evolution/contacts-autocompletion.page
@@ -2523,7 +2648,6 @@ share/help/eu/evolution/exporting-data-calendar.page
 share/help/eu/evolution/exporting-data-contacts.page
 share/help/eu/evolution/exporting-data-mail.page
 share/help/eu/evolution/exporting-data.page
-share/help/eu/evolution/express-mode.page
 share/help/eu/evolution/figures/color-000000.png
 share/help/eu/evolution/figures/color-204a87.png
 share/help/eu/evolution/figures/color-2e3436.png
@@ -2545,7 +2669,6 @@ share/help/eu/evolution/figures/plus-icon.png
 share/help/eu/evolution/figures/search-icon.png
 share/help/eu/evolution/figures/window-overview-layers.png
 share/help/eu/evolution/google-services.page
-share/help/eu/evolution/groupwise-placeholder.page
 share/help/eu/evolution/import-apps-mozilla.page
 share/help/eu/evolution/import-apps-outlook.page
 share/help/eu/evolution/import-data.page
@@ -2555,18 +2678,16 @@ share/help/eu/evolution/index.page
 share/help/eu/evolution/intro-application.page
 share/help/eu/evolution/intro-first-run.page
 share/help/eu/evolution/intro-main-window.page
+share/help/eu/evolution/legal.xml
 share/help/eu/evolution/mail-access-gmail-imap-account.page
 share/help/eu/evolution/mail-access-gmail-pop-account.page
 share/help/eu/evolution/mail-account-manage-imap-plus.page
-share/help/eu/evolution/mail-account-manage-imap.page
 share/help/eu/evolution/mail-account-manage-local-delivery.page
 share/help/eu/evolution/mail-account-manage-maildir-format-directories.page
 share/help/eu/evolution/mail-account-manage-mh-format-directories.page
 share/help/eu/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/eu/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/eu/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/eu/evolution/mail-account-manage-microsoft-exchange.page
-share/help/eu/evolution/mail-account-manage-novell-groupwise.page
 share/help/eu/evolution/mail-account-manage-pop.page
 share/help/eu/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/eu/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -2612,7 +2733,6 @@ share/help/eu/evolution/mail-displaying-character-encodings.page
 share/help/eu/evolution/mail-displaying-collapsible-headers.page
 share/help/eu/evolution/mail-displaying-images-in-html.page
 share/help/eu/evolution/mail-displaying-message.page
-share/help/eu/evolution/mail-displaying-no-css.page
 share/help/eu/evolution/mail-displaying-sender-photograph.page
 share/help/eu/evolution/mail-duplicates.page
 share/help/eu/evolution/mail-encryption-gpg-create-key.page
@@ -2623,15 +2743,12 @@ share/help/eu/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/eu/evolution/mail-encryption-s-mime-manage.page
 share/help/eu/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/eu/evolution/mail-encryption.page
-share/help/eu/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/eu/evolution/mail-error-no-provider-available.page
 share/help/eu/evolution/mail-filters-actions.page
 share/help/eu/evolution/mail-filters-conditions.page
 share/help/eu/evolution/mail-filters-not-working.page
 share/help/eu/evolution/mail-filters.page
 share/help/eu/evolution/mail-folders.page
 share/help/eu/evolution/mail-follow-up-flag.page
-share/help/eu/evolution/mail-imap-headers.page
 share/help/eu/evolution/mail-imap-subscriptions.page
 share/help/eu/evolution/mail-labels.page
 share/help/eu/evolution/mail-layout-changing.page
@@ -2642,15 +2759,12 @@ share/help/eu/evolution/mail-organizing.page
 share/help/eu/evolution/mail-read-receipts.page
 share/help/eu/evolution/mail-reading-keyboard-shortcuts.page
 share/help/eu/evolution/mail-received-notification.page
-share/help/eu/evolution/mail-receiving-options-evolution-exchange.page
 share/help/eu/evolution/mail-receiving-options-exchange-ews.page
 share/help/eu/evolution/mail-receiving-options-exchange-mapi.page
 share/help/eu/evolution/mail-receiving-options-imap-plus.page
-share/help/eu/evolution/mail-receiving-options-imap.page
 share/help/eu/evolution/mail-receiving-options-local-delivery.page
 share/help/eu/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/eu/evolution/mail-receiving-options-mh-format-directories.page
-share/help/eu/evolution/mail-receiving-options-novell-groupwise.page
 share/help/eu/evolution/mail-receiving-options-pop.page
 share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -2705,6 +2819,9 @@ share/help/eu/evolution/tasks-usage.page
 share/help/eu/evolution/tasks-using-several-tasklists.page
 share/help/eu/evolution/tasks-webdav.page
 share/help/eu/evolution/using-categories.page
+share/help/eu/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/eu/evolution/xinclude-mail-account-identity.xml
+share/help/eu/evolution/xinclude-searching.xml
 share/help/fr/evolution/backup-restore.page
 share/help/fr/evolution/calendar-alarms-and-reminders.page
 share/help/fr/evolution/calendar-caldav.page
@@ -2734,7 +2851,6 @@ share/help/fr/evolution/calendar-usage.page
 share/help/fr/evolution/calendar-using-several-calendars.page
 share/help/fr/evolution/calendar-weather.page
 share/help/fr/evolution/calendar-webdav.page
-share/help/fr/evolution/change-keyboard-shortcuts.page
 share/help/fr/evolution/change-switcher-appearance.page
 share/help/fr/evolution/contacts-add-automatically.page
 share/help/fr/evolution/contacts-autocompletion.page
@@ -2762,7 +2878,6 @@ share/help/fr/evolution/exporting-data-calendar.page
 share/help/fr/evolution/exporting-data-contacts.page
 share/help/fr/evolution/exporting-data-mail.page
 share/help/fr/evolution/exporting-data.page
-share/help/fr/evolution/express-mode.page
 share/help/fr/evolution/figures/color-000000.png
 share/help/fr/evolution/figures/color-204a87.png
 share/help/fr/evolution/figures/color-2e3436.png
@@ -2784,7 +2899,6 @@ share/help/fr/evolution/figures/plus-icon.png
 share/help/fr/evolution/figures/search-icon.png
 share/help/fr/evolution/figures/window-overview-layers.png
 share/help/fr/evolution/google-services.page
-share/help/fr/evolution/groupwise-placeholder.page
 share/help/fr/evolution/import-apps-mozilla.page
 share/help/fr/evolution/import-apps-outlook.page
 share/help/fr/evolution/import-data.page
@@ -2794,18 +2908,16 @@ share/help/fr/evolution/index.page
 share/help/fr/evolution/intro-application.page
 share/help/fr/evolution/intro-first-run.page
 share/help/fr/evolution/intro-main-window.page
+share/help/fr/evolution/legal.xml
 share/help/fr/evolution/mail-access-gmail-imap-account.page
 share/help/fr/evolution/mail-access-gmail-pop-account.page
 share/help/fr/evolution/mail-account-manage-imap-plus.page
-share/help/fr/evolution/mail-account-manage-imap.page
 share/help/fr/evolution/mail-account-manage-local-delivery.page
 share/help/fr/evolution/mail-account-manage-maildir-format-directories.page
 share/help/fr/evolution/mail-account-manage-mh-format-directories.page
 share/help/fr/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/fr/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/fr/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/fr/evolution/mail-account-manage-microsoft-exchange.page
-share/help/fr/evolution/mail-account-manage-novell-groupwise.page
 share/help/fr/evolution/mail-account-manage-pop.page
 share/help/fr/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/fr/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -2851,7 +2963,6 @@ share/help/fr/evolution/mail-displaying-character-encodings.page
 share/help/fr/evolution/mail-displaying-collapsible-headers.page
 share/help/fr/evolution/mail-displaying-images-in-html.page
 share/help/fr/evolution/mail-displaying-message.page
-share/help/fr/evolution/mail-displaying-no-css.page
 share/help/fr/evolution/mail-displaying-sender-photograph.page
 share/help/fr/evolution/mail-duplicates.page
 share/help/fr/evolution/mail-encryption-gpg-create-key.page
@@ -2862,15 +2973,12 @@ share/help/fr/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/fr/evolution/mail-encryption-s-mime-manage.page
 share/help/fr/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/fr/evolution/mail-encryption.page
-share/help/fr/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/fr/evolution/mail-error-no-provider-available.page
 share/help/fr/evolution/mail-filters-actions.page
 share/help/fr/evolution/mail-filters-conditions.page
 share/help/fr/evolution/mail-filters-not-working.page
 share/help/fr/evolution/mail-filters.page
 share/help/fr/evolution/mail-folders.page
 share/help/fr/evolution/mail-follow-up-flag.page
-share/help/fr/evolution/mail-imap-headers.page
 share/help/fr/evolution/mail-imap-subscriptions.page
 share/help/fr/evolution/mail-labels.page
 share/help/fr/evolution/mail-layout-changing.page
@@ -2881,15 +2989,12 @@ share/help/fr/evolution/mail-organizing.page
 share/help/fr/evolution/mail-read-receipts.page
 share/help/fr/evolution/mail-reading-keyboard-shortcuts.page
 share/help/fr/evolution/mail-received-notification.page
-share/help/fr/evolution/mail-receiving-options-evolution-exchange.page
 share/help/fr/evolution/mail-receiving-options-exchange-ews.page
 share/help/fr/evolution/mail-receiving-options-exchange-mapi.page
 share/help/fr/evolution/mail-receiving-options-imap-plus.page
-share/help/fr/evolution/mail-receiving-options-imap.page
 share/help/fr/evolution/mail-receiving-options-local-delivery.page
 share/help/fr/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/fr/evolution/mail-receiving-options-mh-format-directories.page
-share/help/fr/evolution/mail-receiving-options-novell-groupwise.page
 share/help/fr/evolution/mail-receiving-options-pop.page
 share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -2944,6 +3049,9 @@ share/help/fr/evolution/tasks-usage.page
 share/help/fr/evolution/tasks-using-several-tasklists.page
 share/help/fr/evolution/tasks-webdav.page
 share/help/fr/evolution/using-categories.page
+share/help/fr/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/fr/evolution/xinclude-mail-account-identity.xml
+share/help/fr/evolution/xinclude-searching.xml
 share/help/gl/evolution/backup-restore.page
 share/help/gl/evolution/calendar-alarms-and-reminders.page
 share/help/gl/evolution/calendar-caldav.page
@@ -2973,7 +3081,6 @@ share/help/gl/evolution/calendar-usage.page
 share/help/gl/evolution/calendar-using-several-calendars.page
 share/help/gl/evolution/calendar-weather.page
 share/help/gl/evolution/calendar-webdav.page
-share/help/gl/evolution/change-keyboard-shortcuts.page
 share/help/gl/evolution/change-switcher-appearance.page
 share/help/gl/evolution/contacts-add-automatically.page
 share/help/gl/evolution/contacts-autocompletion.page
@@ -3001,7 +3108,6 @@ share/help/gl/evolution/exporting-data-calendar.page
 share/help/gl/evolution/exporting-data-contacts.page
 share/help/gl/evolution/exporting-data-mail.page
 share/help/gl/evolution/exporting-data.page
-share/help/gl/evolution/express-mode.page
 share/help/gl/evolution/figures/color-000000.png
 share/help/gl/evolution/figures/color-204a87.png
 share/help/gl/evolution/figures/color-2e3436.png
@@ -3023,7 +3129,6 @@ share/help/gl/evolution/figures/plus-icon.png
 share/help/gl/evolution/figures/search-icon.png
 share/help/gl/evolution/figures/window-overview-layers.png
 share/help/gl/evolution/google-services.page
-share/help/gl/evolution/groupwise-placeholder.page
 share/help/gl/evolution/import-apps-mozilla.page
 share/help/gl/evolution/import-apps-outlook.page
 share/help/gl/evolution/import-data.page
@@ -3033,18 +3138,16 @@ share/help/gl/evolution/index.page
 share/help/gl/evolution/intro-application.page
 share/help/gl/evolution/intro-first-run.page
 share/help/gl/evolution/intro-main-window.page
+share/help/gl/evolution/legal.xml
 share/help/gl/evolution/mail-access-gmail-imap-account.page
 share/help/gl/evolution/mail-access-gmail-pop-account.page
 share/help/gl/evolution/mail-account-manage-imap-plus.page
-share/help/gl/evolution/mail-account-manage-imap.page
 share/help/gl/evolution/mail-account-manage-local-delivery.page
 share/help/gl/evolution/mail-account-manage-maildir-format-directories.page
 share/help/gl/evolution/mail-account-manage-mh-format-directories.page
 share/help/gl/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/gl/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/gl/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/gl/evolution/mail-account-manage-microsoft-exchange.page
-share/help/gl/evolution/mail-account-manage-novell-groupwise.page
 share/help/gl/evolution/mail-account-manage-pop.page
 share/help/gl/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/gl/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -3090,7 +3193,6 @@ share/help/gl/evolution/mail-displaying-character-encodings.page
 share/help/gl/evolution/mail-displaying-collapsible-headers.page
 share/help/gl/evolution/mail-displaying-images-in-html.page
 share/help/gl/evolution/mail-displaying-message.page
-share/help/gl/evolution/mail-displaying-no-css.page
 share/help/gl/evolution/mail-displaying-sender-photograph.page
 share/help/gl/evolution/mail-duplicates.page
 share/help/gl/evolution/mail-encryption-gpg-create-key.page
@@ -3101,15 +3203,12 @@ share/help/gl/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/gl/evolution/mail-encryption-s-mime-manage.page
 share/help/gl/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/gl/evolution/mail-encryption.page
-share/help/gl/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/gl/evolution/mail-error-no-provider-available.page
 share/help/gl/evolution/mail-filters-actions.page
 share/help/gl/evolution/mail-filters-conditions.page
 share/help/gl/evolution/mail-filters-not-working.page
 share/help/gl/evolution/mail-filters.page
 share/help/gl/evolution/mail-folders.page
 share/help/gl/evolution/mail-follow-up-flag.page
-share/help/gl/evolution/mail-imap-headers.page
 share/help/gl/evolution/mail-imap-subscriptions.page
 share/help/gl/evolution/mail-labels.page
 share/help/gl/evolution/mail-layout-changing.page
@@ -3120,15 +3219,12 @@ share/help/gl/evolution/mail-organizing.page
 share/help/gl/evolution/mail-read-receipts.page
 share/help/gl/evolution/mail-reading-keyboard-shortcuts.page
 share/help/gl/evolution/mail-received-notification.page
-share/help/gl/evolution/mail-receiving-options-evolution-exchange.page
 share/help/gl/evolution/mail-receiving-options-exchange-ews.page
 share/help/gl/evolution/mail-receiving-options-exchange-mapi.page
 share/help/gl/evolution/mail-receiving-options-imap-plus.page
-share/help/gl/evolution/mail-receiving-options-imap.page
 share/help/gl/evolution/mail-receiving-options-local-delivery.page
 share/help/gl/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/gl/evolution/mail-receiving-options-mh-format-directories.page
-share/help/gl/evolution/mail-receiving-options-novell-groupwise.page
 share/help/gl/evolution/mail-receiving-options-pop.page
 share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -3183,6 +3279,9 @@ share/help/gl/evolution/tasks-usage.page
 share/help/gl/evolution/tasks-using-several-tasklists.page
 share/help/gl/evolution/tasks-webdav.page
 share/help/gl/evolution/using-categories.page
+share/help/gl/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/gl/evolution/xinclude-mail-account-identity.xml
+share/help/gl/evolution/xinclude-searching.xml
 share/help/hu/evolution/backup-restore.page
 share/help/hu/evolution/calendar-alarms-and-reminders.page
 share/help/hu/evolution/calendar-caldav.page
@@ -3212,7 +3311,6 @@ share/help/hu/evolution/calendar-usage.page
 share/help/hu/evolution/calendar-using-several-calendars.page
 share/help/hu/evolution/calendar-weather.page
 share/help/hu/evolution/calendar-webdav.page
-share/help/hu/evolution/change-keyboard-shortcuts.page
 share/help/hu/evolution/change-switcher-appearance.page
 share/help/hu/evolution/contacts-add-automatically.page
 share/help/hu/evolution/contacts-autocompletion.page
@@ -3240,7 +3338,6 @@ share/help/hu/evolution/exporting-data-calendar.page
 share/help/hu/evolution/exporting-data-contacts.page
 share/help/hu/evolution/exporting-data-mail.page
 share/help/hu/evolution/exporting-data.page
-share/help/hu/evolution/express-mode.page
 share/help/hu/evolution/figures/color-000000.png
 share/help/hu/evolution/figures/color-204a87.png
 share/help/hu/evolution/figures/color-2e3436.png
@@ -3262,7 +3359,6 @@ share/help/hu/evolution/figures/plus-icon.png
 share/help/hu/evolution/figures/search-icon.png
 share/help/hu/evolution/figures/window-overview-layers.png
 share/help/hu/evolution/google-services.page
-share/help/hu/evolution/groupwise-placeholder.page
 share/help/hu/evolution/import-apps-mozilla.page
 share/help/hu/evolution/import-apps-outlook.page
 share/help/hu/evolution/import-data.page
@@ -3272,18 +3368,16 @@ share/help/hu/evolution/index.page
 share/help/hu/evolution/intro-application.page
 share/help/hu/evolution/intro-first-run.page
 share/help/hu/evolution/intro-main-window.page
+share/help/hu/evolution/legal.xml
 share/help/hu/evolution/mail-access-gmail-imap-account.page
 share/help/hu/evolution/mail-access-gmail-pop-account.page
 share/help/hu/evolution/mail-account-manage-imap-plus.page
-share/help/hu/evolution/mail-account-manage-imap.page
 share/help/hu/evolution/mail-account-manage-local-delivery.page
 share/help/hu/evolution/mail-account-manage-maildir-format-directories.page
 share/help/hu/evolution/mail-account-manage-mh-format-directories.page
 share/help/hu/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/hu/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/hu/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/hu/evolution/mail-account-manage-microsoft-exchange.page
-share/help/hu/evolution/mail-account-manage-novell-groupwise.page
 share/help/hu/evolution/mail-account-manage-pop.page
 share/help/hu/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/hu/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -3329,7 +3423,6 @@ share/help/hu/evolution/mail-displaying-character-encodings.page
 share/help/hu/evolution/mail-displaying-collapsible-headers.page
 share/help/hu/evolution/mail-displaying-images-in-html.page
 share/help/hu/evolution/mail-displaying-message.page
-share/help/hu/evolution/mail-displaying-no-css.page
 share/help/hu/evolution/mail-displaying-sender-photograph.page
 share/help/hu/evolution/mail-duplicates.page
 share/help/hu/evolution/mail-encryption-gpg-create-key.page
@@ -3340,15 +3433,12 @@ share/help/hu/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/hu/evolution/mail-encryption-s-mime-manage.page
 share/help/hu/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/hu/evolution/mail-encryption.page
-share/help/hu/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/hu/evolution/mail-error-no-provider-available.page
 share/help/hu/evolution/mail-filters-actions.page
 share/help/hu/evolution/mail-filters-conditions.page
 share/help/hu/evolution/mail-filters-not-working.page
 share/help/hu/evolution/mail-filters.page
 share/help/hu/evolution/mail-folders.page
 share/help/hu/evolution/mail-follow-up-flag.page
-share/help/hu/evolution/mail-imap-headers.page
 share/help/hu/evolution/mail-imap-subscriptions.page
 share/help/hu/evolution/mail-labels.page
 share/help/hu/evolution/mail-layout-changing.page
@@ -3359,15 +3449,12 @@ share/help/hu/evolution/mail-organizing.page
 share/help/hu/evolution/mail-read-receipts.page
 share/help/hu/evolution/mail-reading-keyboard-shortcuts.page
 share/help/hu/evolution/mail-received-notification.page
-share/help/hu/evolution/mail-receiving-options-evolution-exchange.page
 share/help/hu/evolution/mail-receiving-options-exchange-ews.page
 share/help/hu/evolution/mail-receiving-options-exchange-mapi.page
 share/help/hu/evolution/mail-receiving-options-imap-plus.page
-share/help/hu/evolution/mail-receiving-options-imap.page
 share/help/hu/evolution/mail-receiving-options-local-delivery.page
 share/help/hu/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/hu/evolution/mail-receiving-options-mh-format-directories.page
-share/help/hu/evolution/mail-receiving-options-novell-groupwise.page
 share/help/hu/evolution/mail-receiving-options-pop.page
 share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -3422,6 +3509,9 @@ share/help/hu/evolution/tasks-usage.page
 share/help/hu/evolution/tasks-using-several-tasklists.page
 share/help/hu/evolution/tasks-webdav.page
 share/help/hu/evolution/using-categories.page
+share/help/hu/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/hu/evolution/xinclude-mail-account-identity.xml
+share/help/hu/evolution/xinclude-searching.xml
 share/help/mk/evolution/backup-restore.page
 share/help/mk/evolution/calendar-alarms-and-reminders.page
 share/help/mk/evolution/calendar-caldav.page
@@ -3451,7 +3541,6 @@ share/help/mk/evolution/calendar-usage.page
 share/help/mk/evolution/calendar-using-several-calendars.page
 share/help/mk/evolution/calendar-weather.page
 share/help/mk/evolution/calendar-webdav.page
-share/help/mk/evolution/change-keyboard-shortcuts.page
 share/help/mk/evolution/change-switcher-appearance.page
 share/help/mk/evolution/contacts-add-automatically.page
 share/help/mk/evolution/contacts-autocompletion.page
@@ -3479,7 +3568,6 @@ share/help/mk/evolution/exporting-data-calendar.page
 share/help/mk/evolution/exporting-data-contacts.page
 share/help/mk/evolution/exporting-data-mail.page
 share/help/mk/evolution/exporting-data.page
-share/help/mk/evolution/express-mode.page
 share/help/mk/evolution/figures/color-000000.png
 share/help/mk/evolution/figures/color-204a87.png
 share/help/mk/evolution/figures/color-2e3436.png
@@ -3501,7 +3589,6 @@ share/help/mk/evolution/figures/plus-icon.png
 share/help/mk/evolution/figures/search-icon.png
 share/help/mk/evolution/figures/window-overview-layers.png
 share/help/mk/evolution/google-services.page
-share/help/mk/evolution/groupwise-placeholder.page
 share/help/mk/evolution/import-apps-mozilla.page
 share/help/mk/evolution/import-apps-outlook.page
 share/help/mk/evolution/import-data.page
@@ -3511,18 +3598,16 @@ share/help/mk/evolution/index.page
 share/help/mk/evolution/intro-application.page
 share/help/mk/evolution/intro-first-run.page
 share/help/mk/evolution/intro-main-window.page
+share/help/mk/evolution/legal.xml
 share/help/mk/evolution/mail-access-gmail-imap-account.page
 share/help/mk/evolution/mail-access-gmail-pop-account.page
 share/help/mk/evolution/mail-account-manage-imap-plus.page
-share/help/mk/evolution/mail-account-manage-imap.page
 share/help/mk/evolution/mail-account-manage-local-delivery.page
 share/help/mk/evolution/mail-account-manage-maildir-format-directories.page
 share/help/mk/evolution/mail-account-manage-mh-format-directories.page
 share/help/mk/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/mk/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/mk/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/mk/evolution/mail-account-manage-microsoft-exchange.page
-share/help/mk/evolution/mail-account-manage-novell-groupwise.page
 share/help/mk/evolution/mail-account-manage-pop.page
 share/help/mk/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/mk/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -3568,7 +3653,6 @@ share/help/mk/evolution/mail-displaying-character-encodings.page
 share/help/mk/evolution/mail-displaying-collapsible-headers.page
 share/help/mk/evolution/mail-displaying-images-in-html.page
 share/help/mk/evolution/mail-displaying-message.page
-share/help/mk/evolution/mail-displaying-no-css.page
 share/help/mk/evolution/mail-displaying-sender-photograph.page
 share/help/mk/evolution/mail-duplicates.page
 share/help/mk/evolution/mail-encryption-gpg-create-key.page
@@ -3579,15 +3663,12 @@ share/help/mk/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/mk/evolution/mail-encryption-s-mime-manage.page
 share/help/mk/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/mk/evolution/mail-encryption.page
-share/help/mk/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/mk/evolution/mail-error-no-provider-available.page
 share/help/mk/evolution/mail-filters-actions.page
 share/help/mk/evolution/mail-filters-conditions.page
 share/help/mk/evolution/mail-filters-not-working.page
 share/help/mk/evolution/mail-filters.page
 share/help/mk/evolution/mail-folders.page
 share/help/mk/evolution/mail-follow-up-flag.page
-share/help/mk/evolution/mail-imap-headers.page
 share/help/mk/evolution/mail-imap-subscriptions.page
 share/help/mk/evolution/mail-labels.page
 share/help/mk/evolution/mail-layout-changing.page
@@ -3598,15 +3679,12 @@ share/help/mk/evolution/mail-organizing.page
 share/help/mk/evolution/mail-read-receipts.page
 share/help/mk/evolution/mail-reading-keyboard-shortcuts.page
 share/help/mk/evolution/mail-received-notification.page
-share/help/mk/evolution/mail-receiving-options-evolution-exchange.page
 share/help/mk/evolution/mail-receiving-options-exchange-ews.page
 share/help/mk/evolution/mail-receiving-options-exchange-mapi.page
 share/help/mk/evolution/mail-receiving-options-imap-plus.page
-share/help/mk/evolution/mail-receiving-options-imap.page
 share/help/mk/evolution/mail-receiving-options-local-delivery.page
 share/help/mk/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/mk/evolution/mail-receiving-options-mh-format-directories.page
-share/help/mk/evolution/mail-receiving-options-novell-groupwise.page
 share/help/mk/evolution/mail-receiving-options-pop.page
 share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -3661,6 +3739,9 @@ share/help/mk/evolution/tasks-usage.page
 share/help/mk/evolution/tasks-using-several-tasklists.page
 share/help/mk/evolution/tasks-webdav.page
 share/help/mk/evolution/using-categories.page
+share/help/mk/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/mk/evolution/xinclude-mail-account-identity.xml
+share/help/mk/evolution/xinclude-searching.xml
 share/help/oc/evolution/backup-restore.page
 share/help/oc/evolution/calendar-alarms-and-reminders.page
 share/help/oc/evolution/calendar-caldav.page
@@ -3690,7 +3771,6 @@ share/help/oc/evolution/calendar-usage.page
 share/help/oc/evolution/calendar-using-several-calendars.page
 share/help/oc/evolution/calendar-weather.page
 share/help/oc/evolution/calendar-webdav.page
-share/help/oc/evolution/change-keyboard-shortcuts.page
 share/help/oc/evolution/change-switcher-appearance.page
 share/help/oc/evolution/contacts-add-automatically.page
 share/help/oc/evolution/contacts-autocompletion.page
@@ -3718,7 +3798,6 @@ share/help/oc/evolution/exporting-data-calendar.page
 share/help/oc/evolution/exporting-data-contacts.page
 share/help/oc/evolution/exporting-data-mail.page
 share/help/oc/evolution/exporting-data.page
-share/help/oc/evolution/express-mode.page
 share/help/oc/evolution/figures/color-000000.png
 share/help/oc/evolution/figures/color-204a87.png
 share/help/oc/evolution/figures/color-2e3436.png
@@ -3740,7 +3819,6 @@ share/help/oc/evolution/figures/plus-icon.png
 share/help/oc/evolution/figures/search-icon.png
 share/help/oc/evolution/figures/window-overview-layers.png
 share/help/oc/evolution/google-services.page
-share/help/oc/evolution/groupwise-placeholder.page
 share/help/oc/evolution/import-apps-mozilla.page
 share/help/oc/evolution/import-apps-outlook.page
 share/help/oc/evolution/import-data.page
@@ -3750,18 +3828,16 @@ share/help/oc/evolution/index.page
 share/help/oc/evolution/intro-application.page
 share/help/oc/evolution/intro-first-run.page
 share/help/oc/evolution/intro-main-window.page
+share/help/oc/evolution/legal.xml
 share/help/oc/evolution/mail-access-gmail-imap-account.page
 share/help/oc/evolution/mail-access-gmail-pop-account.page
 share/help/oc/evolution/mail-account-manage-imap-plus.page
-share/help/oc/evolution/mail-account-manage-imap.page
 share/help/oc/evolution/mail-account-manage-local-delivery.page
 share/help/oc/evolution/mail-account-manage-maildir-format-directories.page
 share/help/oc/evolution/mail-account-manage-mh-format-directories.page
 share/help/oc/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/oc/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/oc/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/oc/evolution/mail-account-manage-microsoft-exchange.page
-share/help/oc/evolution/mail-account-manage-novell-groupwise.page
 share/help/oc/evolution/mail-account-manage-pop.page
 share/help/oc/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/oc/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -3807,7 +3883,6 @@ share/help/oc/evolution/mail-displaying-character-encodings.page
 share/help/oc/evolution/mail-displaying-collapsible-headers.page
 share/help/oc/evolution/mail-displaying-images-in-html.page
 share/help/oc/evolution/mail-displaying-message.page
-share/help/oc/evolution/mail-displaying-no-css.page
 share/help/oc/evolution/mail-displaying-sender-photograph.page
 share/help/oc/evolution/mail-duplicates.page
 share/help/oc/evolution/mail-encryption-gpg-create-key.page
@@ -3818,15 +3893,12 @@ share/help/oc/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/oc/evolution/mail-encryption-s-mime-manage.page
 share/help/oc/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/oc/evolution/mail-encryption.page
-share/help/oc/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/oc/evolution/mail-error-no-provider-available.page
 share/help/oc/evolution/mail-filters-actions.page
 share/help/oc/evolution/mail-filters-conditions.page
 share/help/oc/evolution/mail-filters-not-working.page
 share/help/oc/evolution/mail-filters.page
 share/help/oc/evolution/mail-folders.page
 share/help/oc/evolution/mail-follow-up-flag.page
-share/help/oc/evolution/mail-imap-headers.page
 share/help/oc/evolution/mail-imap-subscriptions.page
 share/help/oc/evolution/mail-labels.page
 share/help/oc/evolution/mail-layout-changing.page
@@ -3837,15 +3909,12 @@ share/help/oc/evolution/mail-organizing.page
 share/help/oc/evolution/mail-read-receipts.page
 share/help/oc/evolution/mail-reading-keyboard-shortcuts.page
 share/help/oc/evolution/mail-received-notification.page
-share/help/oc/evolution/mail-receiving-options-evolution-exchange.page
 share/help/oc/evolution/mail-receiving-options-exchange-ews.page
 share/help/oc/evolution/mail-receiving-options-exchange-mapi.page
 share/help/oc/evolution/mail-receiving-options-imap-plus.page
-share/help/oc/evolution/mail-receiving-options-imap.page
 share/help/oc/evolution/mail-receiving-options-local-delivery.page
 share/help/oc/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/oc/evolution/mail-receiving-options-mh-format-directories.page
-share/help/oc/evolution/mail-receiving-options-novell-groupwise.page
 share/help/oc/evolution/mail-receiving-options-pop.page
 share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -3900,6 +3969,9 @@ share/help/oc/evolution/tasks-usage.page
 share/help/oc/evolution/tasks-using-several-tasklists.page
 share/help/oc/evolution/tasks-webdav.page
 share/help/oc/evolution/using-categories.page
+share/help/oc/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/oc/evolution/xinclude-mail-account-identity.xml
+share/help/oc/evolution/xinclude-searching.xml
 share/help/ru/evolution/backup-restore.page
 share/help/ru/evolution/calendar-alarms-and-reminders.page
 share/help/ru/evolution/calendar-caldav.page
@@ -3929,7 +4001,6 @@ share/help/ru/evolution/calendar-usage.page
 share/help/ru/evolution/calendar-using-several-calendars.page
 share/help/ru/evolution/calendar-weather.page
 share/help/ru/evolution/calendar-webdav.page
-share/help/ru/evolution/change-keyboard-shortcuts.page
 share/help/ru/evolution/change-switcher-appearance.page
 share/help/ru/evolution/contacts-add-automatically.page
 share/help/ru/evolution/contacts-autocompletion.page
@@ -3957,7 +4028,6 @@ share/help/ru/evolution/exporting-data-calendar.page
 share/help/ru/evolution/exporting-data-contacts.page
 share/help/ru/evolution/exporting-data-mail.page
 share/help/ru/evolution/exporting-data.page
-share/help/ru/evolution/express-mode.page
 share/help/ru/evolution/figures/color-000000.png
 share/help/ru/evolution/figures/color-204a87.png
 share/help/ru/evolution/figures/color-2e3436.png
@@ -3979,7 +4049,6 @@ share/help/ru/evolution/figures/plus-icon.png
 share/help/ru/evolution/figures/search-icon.png
 share/help/ru/evolution/figures/window-overview-layers.png
 share/help/ru/evolution/google-services.page
-share/help/ru/evolution/groupwise-placeholder.page
 share/help/ru/evolution/import-apps-mozilla.page
 share/help/ru/evolution/import-apps-outlook.page
 share/help/ru/evolution/import-data.page
@@ -3989,18 +4058,16 @@ share/help/ru/evolution/index.page
 share/help/ru/evolution/intro-application.page
 share/help/ru/evolution/intro-first-run.page
 share/help/ru/evolution/intro-main-window.page
+share/help/ru/evolution/legal.xml
 share/help/ru/evolution/mail-access-gmail-imap-account.page
 share/help/ru/evolution/mail-access-gmail-pop-account.page
 share/help/ru/evolution/mail-account-manage-imap-plus.page
-share/help/ru/evolution/mail-account-manage-imap.page
 share/help/ru/evolution/mail-account-manage-local-delivery.page
 share/help/ru/evolution/mail-account-manage-maildir-format-directories.page
 share/help/ru/evolution/mail-account-manage-mh-format-directories.page
 share/help/ru/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/ru/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/ru/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/ru/evolution/mail-account-manage-microsoft-exchange.page
-share/help/ru/evolution/mail-account-manage-novell-groupwise.page
 share/help/ru/evolution/mail-account-manage-pop.page
 share/help/ru/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/ru/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -4046,7 +4113,6 @@ share/help/ru/evolution/mail-displaying-character-encodings.page
 share/help/ru/evolution/mail-displaying-collapsible-headers.page
 share/help/ru/evolution/mail-displaying-images-in-html.page
 share/help/ru/evolution/mail-displaying-message.page
-share/help/ru/evolution/mail-displaying-no-css.page
 share/help/ru/evolution/mail-displaying-sender-photograph.page
 share/help/ru/evolution/mail-duplicates.page
 share/help/ru/evolution/mail-encryption-gpg-create-key.page
@@ -4057,15 +4123,12 @@ share/help/ru/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/ru/evolution/mail-encryption-s-mime-manage.page
 share/help/ru/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/ru/evolution/mail-encryption.page
-share/help/ru/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/ru/evolution/mail-error-no-provider-available.page
 share/help/ru/evolution/mail-filters-actions.page
 share/help/ru/evolution/mail-filters-conditions.page
 share/help/ru/evolution/mail-filters-not-working.page
 share/help/ru/evolution/mail-filters.page
 share/help/ru/evolution/mail-folders.page
 share/help/ru/evolution/mail-follow-up-flag.page
-share/help/ru/evolution/mail-imap-headers.page
 share/help/ru/evolution/mail-imap-subscriptions.page
 share/help/ru/evolution/mail-labels.page
 share/help/ru/evolution/mail-layout-changing.page
@@ -4076,15 +4139,12 @@ share/help/ru/evolution/mail-organizing.page
 share/help/ru/evolution/mail-read-receipts.page
 share/help/ru/evolution/mail-reading-keyboard-shortcuts.page
 share/help/ru/evolution/mail-received-notification.page
-share/help/ru/evolution/mail-receiving-options-evolution-exchange.page
 share/help/ru/evolution/mail-receiving-options-exchange-ews.page
 share/help/ru/evolution/mail-receiving-options-exchange-mapi.page
 share/help/ru/evolution/mail-receiving-options-imap-plus.page
-share/help/ru/evolution/mail-receiving-options-imap.page
 share/help/ru/evolution/mail-receiving-options-local-delivery.page
 share/help/ru/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/ru/evolution/mail-receiving-options-mh-format-directories.page
-share/help/ru/evolution/mail-receiving-options-novell-groupwise.page
 share/help/ru/evolution/mail-receiving-options-pop.page
 share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -4139,6 +4199,9 @@ share/help/ru/evolution/tasks-usage.page
 share/help/ru/evolution/tasks-using-several-tasklists.page
 share/help/ru/evolution/tasks-webdav.page
 share/help/ru/evolution/using-categories.page
+share/help/ru/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/ru/evolution/xinclude-mail-account-identity.xml
+share/help/ru/evolution/xinclude-searching.xml
 share/help/sl/evolution/backup-restore.page
 share/help/sl/evolution/calendar-alarms-and-reminders.page
 share/help/sl/evolution/calendar-caldav.page
@@ -4168,7 +4231,6 @@ share/help/sl/evolution/calendar-usage.page
 share/help/sl/evolution/calendar-using-several-calendars.page
 share/help/sl/evolution/calendar-weather.page
 share/help/sl/evolution/calendar-webdav.page
-share/help/sl/evolution/change-keyboard-shortcuts.page
 share/help/sl/evolution/change-switcher-appearance.page
 share/help/sl/evolution/contacts-add-automatically.page
 share/help/sl/evolution/contacts-autocompletion.page
@@ -4196,7 +4258,6 @@ share/help/sl/evolution/exporting-data-calendar.page
 share/help/sl/evolution/exporting-data-contacts.page
 share/help/sl/evolution/exporting-data-mail.page
 share/help/sl/evolution/exporting-data.page
-share/help/sl/evolution/express-mode.page
 share/help/sl/evolution/figures/color-000000.png
 share/help/sl/evolution/figures/color-204a87.png
 share/help/sl/evolution/figures/color-2e3436.png
@@ -4218,7 +4279,6 @@ share/help/sl/evolution/figures/plus-icon.png
 share/help/sl/evolution/figures/search-icon.png
 share/help/sl/evolution/figures/window-overview-layers.png
 share/help/sl/evolution/google-services.page
-share/help/sl/evolution/groupwise-placeholder.page
 share/help/sl/evolution/import-apps-mozilla.page
 share/help/sl/evolution/import-apps-outlook.page
 share/help/sl/evolution/import-data.page
@@ -4228,18 +4288,16 @@ share/help/sl/evolution/index.page
 share/help/sl/evolution/intro-application.page
 share/help/sl/evolution/intro-first-run.page
 share/help/sl/evolution/intro-main-window.page
+share/help/sl/evolution/legal.xml
 share/help/sl/evolution/mail-access-gmail-imap-account.page
 share/help/sl/evolution/mail-access-gmail-pop-account.page
 share/help/sl/evolution/mail-account-manage-imap-plus.page
-share/help/sl/evolution/mail-account-manage-imap.page
 share/help/sl/evolution/mail-account-manage-local-delivery.page
 share/help/sl/evolution/mail-account-manage-maildir-format-directories.page
 share/help/sl/evolution/mail-account-manage-mh-format-directories.page
 share/help/sl/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/sl/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/sl/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/sl/evolution/mail-account-manage-microsoft-exchange.page
-share/help/sl/evolution/mail-account-manage-novell-groupwise.page
 share/help/sl/evolution/mail-account-manage-pop.page
 share/help/sl/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/sl/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -4285,7 +4343,6 @@ share/help/sl/evolution/mail-displaying-character-encodings.page
 share/help/sl/evolution/mail-displaying-collapsible-headers.page
 share/help/sl/evolution/mail-displaying-images-in-html.page
 share/help/sl/evolution/mail-displaying-message.page
-share/help/sl/evolution/mail-displaying-no-css.page
 share/help/sl/evolution/mail-displaying-sender-photograph.page
 share/help/sl/evolution/mail-duplicates.page
 share/help/sl/evolution/mail-encryption-gpg-create-key.page
@@ -4296,15 +4353,12 @@ share/help/sl/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/sl/evolution/mail-encryption-s-mime-manage.page
 share/help/sl/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/sl/evolution/mail-encryption.page
-share/help/sl/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/sl/evolution/mail-error-no-provider-available.page
 share/help/sl/evolution/mail-filters-actions.page
 share/help/sl/evolution/mail-filters-conditions.page
 share/help/sl/evolution/mail-filters-not-working.page
 share/help/sl/evolution/mail-filters.page
 share/help/sl/evolution/mail-folders.page
 share/help/sl/evolution/mail-follow-up-flag.page
-share/help/sl/evolution/mail-imap-headers.page
 share/help/sl/evolution/mail-imap-subscriptions.page
 share/help/sl/evolution/mail-labels.page
 share/help/sl/evolution/mail-layout-changing.page
@@ -4315,15 +4369,12 @@ share/help/sl/evolution/mail-organizing.page
 share/help/sl/evolution/mail-read-receipts.page
 share/help/sl/evolution/mail-reading-keyboard-shortcuts.page
 share/help/sl/evolution/mail-received-notification.page
-share/help/sl/evolution/mail-receiving-options-evolution-exchange.page
 share/help/sl/evolution/mail-receiving-options-exchange-ews.page
 share/help/sl/evolution/mail-receiving-options-exchange-mapi.page
 share/help/sl/evolution/mail-receiving-options-imap-plus.page
-share/help/sl/evolution/mail-receiving-options-imap.page
 share/help/sl/evolution/mail-receiving-options-local-delivery.page
 share/help/sl/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/sl/evolution/mail-receiving-options-mh-format-directories.page
-share/help/sl/evolution/mail-receiving-options-novell-groupwise.page
 share/help/sl/evolution/mail-receiving-options-pop.page
 share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -4378,6 +4429,9 @@ share/help/sl/evolution/tasks-usage.page
 share/help/sl/evolution/tasks-using-several-tasklists.page
 share/help/sl/evolution/tasks-webdav.page
 share/help/sl/evolution/using-categories.page
+share/help/sl/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/sl/evolution/xinclude-mail-account-identity.xml
+share/help/sl/evolution/xinclude-searching.xml
 share/help/sv/evolution/backup-restore.page
 share/help/sv/evolution/calendar-alarms-and-reminders.page
 share/help/sv/evolution/calendar-caldav.page
@@ -4407,7 +4461,6 @@ share/help/sv/evolution/calendar-usage.page
 share/help/sv/evolution/calendar-using-several-calendars.page
 share/help/sv/evolution/calendar-weather.page
 share/help/sv/evolution/calendar-webdav.page
-share/help/sv/evolution/change-keyboard-shortcuts.page
 share/help/sv/evolution/change-switcher-appearance.page
 share/help/sv/evolution/contacts-add-automatically.page
 share/help/sv/evolution/contacts-autocompletion.page
@@ -4435,7 +4488,6 @@ share/help/sv/evolution/exporting-data-calendar.page
 share/help/sv/evolution/exporting-data-contacts.page
 share/help/sv/evolution/exporting-data-mail.page
 share/help/sv/evolution/exporting-data.page
-share/help/sv/evolution/express-mode.page
 share/help/sv/evolution/figures/color-000000.png
 share/help/sv/evolution/figures/color-204a87.png
 share/help/sv/evolution/figures/color-2e3436.png
@@ -4457,7 +4509,6 @@ share/help/sv/evolution/figures/plus-icon.png
 share/help/sv/evolution/figures/search-icon.png
 share/help/sv/evolution/figures/window-overview-layers.png
 share/help/sv/evolution/google-services.page
-share/help/sv/evolution/groupwise-placeholder.page
 share/help/sv/evolution/import-apps-mozilla.page
 share/help/sv/evolution/import-apps-outlook.page
 share/help/sv/evolution/import-data.page
@@ -4467,18 +4518,16 @@ share/help/sv/evolution/index.page
 share/help/sv/evolution/intro-application.page
 share/help/sv/evolution/intro-first-run.page
 share/help/sv/evolution/intro-main-window.page
+share/help/sv/evolution/legal.xml
 share/help/sv/evolution/mail-access-gmail-imap-account.page
 share/help/sv/evolution/mail-access-gmail-pop-account.page
 share/help/sv/evolution/mail-account-manage-imap-plus.page
-share/help/sv/evolution/mail-account-manage-imap.page
 share/help/sv/evolution/mail-account-manage-local-delivery.page
 share/help/sv/evolution/mail-account-manage-maildir-format-directories.page
 share/help/sv/evolution/mail-account-manage-mh-format-directories.page
 share/help/sv/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/sv/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/sv/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/sv/evolution/mail-account-manage-microsoft-exchange.page
-share/help/sv/evolution/mail-account-manage-novell-groupwise.page
 share/help/sv/evolution/mail-account-manage-pop.page
 share/help/sv/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/sv/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -4524,7 +4573,6 @@ share/help/sv/evolution/mail-displaying-character-encodings.page
 share/help/sv/evolution/mail-displaying-collapsible-headers.page
 share/help/sv/evolution/mail-displaying-images-in-html.page
 share/help/sv/evolution/mail-displaying-message.page
-share/help/sv/evolution/mail-displaying-no-css.page
 share/help/sv/evolution/mail-displaying-sender-photograph.page
 share/help/sv/evolution/mail-duplicates.page
 share/help/sv/evolution/mail-encryption-gpg-create-key.page
@@ -4535,15 +4583,12 @@ share/help/sv/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/sv/evolution/mail-encryption-s-mime-manage.page
 share/help/sv/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/sv/evolution/mail-encryption.page
-share/help/sv/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/sv/evolution/mail-error-no-provider-available.page
 share/help/sv/evolution/mail-filters-actions.page
 share/help/sv/evolution/mail-filters-conditions.page
 share/help/sv/evolution/mail-filters-not-working.page
 share/help/sv/evolution/mail-filters.page
 share/help/sv/evolution/mail-folders.page
 share/help/sv/evolution/mail-follow-up-flag.page
-share/help/sv/evolution/mail-imap-headers.page
 share/help/sv/evolution/mail-imap-subscriptions.page
 share/help/sv/evolution/mail-labels.page
 share/help/sv/evolution/mail-layout-changing.page
@@ -4554,15 +4599,12 @@ share/help/sv/evolution/mail-organizing.page
 share/help/sv/evolution/mail-read-receipts.page
 share/help/sv/evolution/mail-reading-keyboard-shortcuts.page
 share/help/sv/evolution/mail-received-notification.page
-share/help/sv/evolution/mail-receiving-options-evolution-exchange.page
 share/help/sv/evolution/mail-receiving-options-exchange-ews.page
 share/help/sv/evolution/mail-receiving-options-exchange-mapi.page
 share/help/sv/evolution/mail-receiving-options-imap-plus.page
-share/help/sv/evolution/mail-receiving-options-imap.page
 share/help/sv/evolution/mail-receiving-options-local-delivery.page
 share/help/sv/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/sv/evolution/mail-receiving-options-mh-format-directories.page
-share/help/sv/evolution/mail-receiving-options-novell-groupwise.page
 share/help/sv/evolution/mail-receiving-options-pop.page
 share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -4617,6 +4659,9 @@ share/help/sv/evolution/tasks-usage.page
 share/help/sv/evolution/tasks-using-several-tasklists.page
 share/help/sv/evolution/tasks-webdav.page
 share/help/sv/evolution/using-categories.page
+share/help/sv/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/sv/evolution/xinclude-mail-account-identity.xml
+share/help/sv/evolution/xinclude-searching.xml
 share/help/te/evolution/backup-restore.page
 share/help/te/evolution/calendar-alarms-and-reminders.page
 share/help/te/evolution/calendar-caldav.page
@@ -4646,7 +4691,6 @@ share/help/te/evolution/calendar-usage.page
 share/help/te/evolution/calendar-using-several-calendars.page
 share/help/te/evolution/calendar-weather.page
 share/help/te/evolution/calendar-webdav.page
-share/help/te/evolution/change-keyboard-shortcuts.page
 share/help/te/evolution/change-switcher-appearance.page
 share/help/te/evolution/contacts-add-automatically.page
 share/help/te/evolution/contacts-autocompletion.page
@@ -4674,7 +4718,6 @@ share/help/te/evolution/exporting-data-calendar.page
 share/help/te/evolution/exporting-data-contacts.page
 share/help/te/evolution/exporting-data-mail.page
 share/help/te/evolution/exporting-data.page
-share/help/te/evolution/express-mode.page
 share/help/te/evolution/figures/color-000000.png
 share/help/te/evolution/figures/color-204a87.png
 share/help/te/evolution/figures/color-2e3436.png
@@ -4696,7 +4739,6 @@ share/help/te/evolution/figures/plus-icon.png
 share/help/te/evolution/figures/search-icon.png
 share/help/te/evolution/figures/window-overview-layers.png
 share/help/te/evolution/google-services.page
-share/help/te/evolution/groupwise-placeholder.page
 share/help/te/evolution/import-apps-mozilla.page
 share/help/te/evolution/import-apps-outlook.page
 share/help/te/evolution/import-data.page
@@ -4706,18 +4748,16 @@ share/help/te/evolution/index.page
 share/help/te/evolution/intro-application.page
 share/help/te/evolution/intro-first-run.page
 share/help/te/evolution/intro-main-window.page
+share/help/te/evolution/legal.xml
 share/help/te/evolution/mail-access-gmail-imap-account.page
 share/help/te/evolution/mail-access-gmail-pop-account.page
 share/help/te/evolution/mail-account-manage-imap-plus.page
-share/help/te/evolution/mail-account-manage-imap.page
 share/help/te/evolution/mail-account-manage-local-delivery.page
 share/help/te/evolution/mail-account-manage-maildir-format-directories.page
 share/help/te/evolution/mail-account-manage-mh-format-directories.page
 share/help/te/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/te/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/te/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/te/evolution/mail-account-manage-microsoft-exchange.page
-share/help/te/evolution/mail-account-manage-novell-groupwise.page
 share/help/te/evolution/mail-account-manage-pop.page
 share/help/te/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/te/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -4763,7 +4803,6 @@ share/help/te/evolution/mail-displaying-character-encodings.page
 share/help/te/evolution/mail-displaying-collapsible-headers.page
 share/help/te/evolution/mail-displaying-images-in-html.page
 share/help/te/evolution/mail-displaying-message.page
-share/help/te/evolution/mail-displaying-no-css.page
 share/help/te/evolution/mail-displaying-sender-photograph.page
 share/help/te/evolution/mail-duplicates.page
 share/help/te/evolution/mail-encryption-gpg-create-key.page
@@ -4774,15 +4813,12 @@ share/help/te/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/te/evolution/mail-encryption-s-mime-manage.page
 share/help/te/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/te/evolution/mail-encryption.page
-share/help/te/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/te/evolution/mail-error-no-provider-available.page
 share/help/te/evolution/mail-filters-actions.page
 share/help/te/evolution/mail-filters-conditions.page
 share/help/te/evolution/mail-filters-not-working.page
 share/help/te/evolution/mail-filters.page
 share/help/te/evolution/mail-folders.page
 share/help/te/evolution/mail-follow-up-flag.page
-share/help/te/evolution/mail-imap-headers.page
 share/help/te/evolution/mail-imap-subscriptions.page
 share/help/te/evolution/mail-labels.page
 share/help/te/evolution/mail-layout-changing.page
@@ -4793,15 +4829,12 @@ share/help/te/evolution/mail-organizing.page
 share/help/te/evolution/mail-read-receipts.page
 share/help/te/evolution/mail-reading-keyboard-shortcuts.page
 share/help/te/evolution/mail-received-notification.page
-share/help/te/evolution/mail-receiving-options-evolution-exchange.page
 share/help/te/evolution/mail-receiving-options-exchange-ews.page
 share/help/te/evolution/mail-receiving-options-exchange-mapi.page
 share/help/te/evolution/mail-receiving-options-imap-plus.page
-share/help/te/evolution/mail-receiving-options-imap.page
 share/help/te/evolution/mail-receiving-options-local-delivery.page
 share/help/te/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/te/evolution/mail-receiving-options-mh-format-directories.page
-share/help/te/evolution/mail-receiving-options-novell-groupwise.page
 share/help/te/evolution/mail-receiving-options-pop.page
 share/help/te/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/te/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -4856,6 +4889,9 @@ share/help/te/evolution/tasks-usage.page
 share/help/te/evolution/tasks-using-several-tasklists.page
 share/help/te/evolution/tasks-webdav.page
 share/help/te/evolution/using-categories.page
+share/help/te/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/te/evolution/xinclude-mail-account-identity.xml
+share/help/te/evolution/xinclude-searching.xml
 share/help/zh_CN/evolution/backup-restore.page
 share/help/zh_CN/evolution/calendar-alarms-and-reminders.page
 share/help/zh_CN/evolution/calendar-caldav.page
@@ -4885,7 +4921,6 @@ share/help/zh_CN/evolution/calendar-usage.page
 share/help/zh_CN/evolution/calendar-using-several-calendars.page
 share/help/zh_CN/evolution/calendar-weather.page
 share/help/zh_CN/evolution/calendar-webdav.page
-share/help/zh_CN/evolution/change-keyboard-shortcuts.page
 share/help/zh_CN/evolution/change-switcher-appearance.page
 share/help/zh_CN/evolution/contacts-add-automatically.page
 share/help/zh_CN/evolution/contacts-autocompletion.page
@@ -4913,7 +4948,6 @@ share/help/zh_CN/evolution/exporting-data-calendar.page
 share/help/zh_CN/evolution/exporting-data-contacts.page
 share/help/zh_CN/evolution/exporting-data-mail.page
 share/help/zh_CN/evolution/exporting-data.page
-share/help/zh_CN/evolution/express-mode.page
 share/help/zh_CN/evolution/figures/color-000000.png
 share/help/zh_CN/evolution/figures/color-204a87.png
 share/help/zh_CN/evolution/figures/color-2e3436.png
@@ -4935,7 +4969,6 @@ share/help/zh_CN/evolution/figures/plus-icon.png
 share/help/zh_CN/evolution/figures/search-icon.png
 share/help/zh_CN/evolution/figures/window-overview-layers.png
 share/help/zh_CN/evolution/google-services.page
-share/help/zh_CN/evolution/groupwise-placeholder.page
 share/help/zh_CN/evolution/import-apps-mozilla.page
 share/help/zh_CN/evolution/import-apps-outlook.page
 share/help/zh_CN/evolution/import-data.page
@@ -4945,18 +4978,16 @@ share/help/zh_CN/evolution/index.page
 share/help/zh_CN/evolution/intro-application.page
 share/help/zh_CN/evolution/intro-first-run.page
 share/help/zh_CN/evolution/intro-main-window.page
+share/help/zh_CN/evolution/legal.xml
 share/help/zh_CN/evolution/mail-access-gmail-imap-account.page
 share/help/zh_CN/evolution/mail-access-gmail-pop-account.page
 share/help/zh_CN/evolution/mail-account-manage-imap-plus.page
-share/help/zh_CN/evolution/mail-account-manage-imap.page
 share/help/zh_CN/evolution/mail-account-manage-local-delivery.page
 share/help/zh_CN/evolution/mail-account-manage-maildir-format-directories.page
 share/help/zh_CN/evolution/mail-account-manage-mh-format-directories.page
 share/help/zh_CN/evolution/mail-account-manage-microsoft-exchange-evo-ews.page
-share/help/zh_CN/evolution/mail-account-manage-microsoft-exchange-evo-exchange.page
 share/help/zh_CN/evolution/mail-account-manage-microsoft-exchange-evo-mapi.page
 share/help/zh_CN/evolution/mail-account-manage-microsoft-exchange.page
-share/help/zh_CN/evolution/mail-account-manage-novell-groupwise.page
 share/help/zh_CN/evolution/mail-account-manage-pop.page
 share/help/zh_CN/evolution/mail-account-manage-unix-mbox-spool-directory.page
 share/help/zh_CN/evolution/mail-account-manage-unix-mbox-spool-file.page
@@ -5002,7 +5033,6 @@ share/help/zh_CN/evolution/mail-displaying-character-encodings.page
 share/help/zh_CN/evolution/mail-displaying-collapsible-headers.page
 share/help/zh_CN/evolution/mail-displaying-images-in-html.page
 share/help/zh_CN/evolution/mail-displaying-message.page
-share/help/zh_CN/evolution/mail-displaying-no-css.page
 share/help/zh_CN/evolution/mail-displaying-sender-photograph.page
 share/help/zh_CN/evolution/mail-duplicates.page
 share/help/zh_CN/evolution/mail-encryption-gpg-create-key.page
@@ -5013,15 +5043,12 @@ share/help/zh_CN/evolution/mail-encryption-gpg-signing-encrypting.page
 share/help/zh_CN/evolution/mail-encryption-s-mime-manage.page
 share/help/zh_CN/evolution/mail-encryption-s-mime-signing-encrypting.page
 share/help/zh_CN/evolution/mail-encryption.page
-share/help/zh_CN/evolution/mail-error-failed-to-append-to-sent-folder.page
-share/help/zh_CN/evolution/mail-error-no-provider-available.page
 share/help/zh_CN/evolution/mail-filters-actions.page
 share/help/zh_CN/evolution/mail-filters-conditions.page
 share/help/zh_CN/evolution/mail-filters-not-working.page
 share/help/zh_CN/evolution/mail-filters.page
 share/help/zh_CN/evolution/mail-folders.page
 share/help/zh_CN/evolution/mail-follow-up-flag.page
-share/help/zh_CN/evolution/mail-imap-headers.page
 share/help/zh_CN/evolution/mail-imap-subscriptions.page
 share/help/zh_CN/evolution/mail-labels.page
 share/help/zh_CN/evolution/mail-layout-changing.page
@@ -5032,15 +5059,12 @@ share/help/zh_CN/evolution/mail-organizing.page
 share/help/zh_CN/evolution/mail-read-receipts.page
 share/help/zh_CN/evolution/mail-reading-keyboard-shortcuts.page
 share/help/zh_CN/evolution/mail-received-notification.page
-share/help/zh_CN/evolution/mail-receiving-options-evolution-exchange.page
 share/help/zh_CN/evolution/mail-receiving-options-exchange-ews.page
 share/help/zh_CN/evolution/mail-receiving-options-exchange-mapi.page
 share/help/zh_CN/evolution/mail-receiving-options-imap-plus.page
-share/help/zh_CN/evolution/mail-receiving-options-imap.page
 share/help/zh_CN/evolution/mail-receiving-options-local-delivery.page
 share/help/zh_CN/evolution/mail-receiving-options-maildir-format-directories.page
 share/help/zh_CN/evolution/mail-receiving-options-mh-format-directories.page
-share/help/zh_CN/evolution/mail-receiving-options-novell-groupwise.page
 share/help/zh_CN/evolution/mail-receiving-options-pop.page
 share/help/zh_CN/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/zh_CN/evolution/mail-receiving-options-unix-mbox-spool-file.page
@@ -5095,8 +5119,33 @@ share/help/zh_CN/evolution/tasks-usage.page
 share/help/zh_CN/evolution/tasks-using-several-tasklists.page
 share/help/zh_CN/evolution/tasks-webdav.page
 share/help/zh_CN/evolution/using-categories.page
+share/help/zh_CN/evolution/xinclude-filter-vfolder-conditions.xml
+share/help/zh_CN/evolution/xinclude-mail-account-identity.xml
+share/help/zh_CN/evolution/xinclude-searching.xml
+share/icons/hicolor/16x16/apps/evolution-mail.png
+share/icons/hicolor/16x16/apps/evolution-memos.png
+share/icons/hicolor/16x16/apps/evolution-tasks.png
+share/icons/hicolor/16x16/apps/evolution.png
+share/icons/hicolor/22x22/apps/evolution-mail.png
+share/icons/hicolor/22x22/apps/evolution-memos.png
+share/icons/hicolor/22x22/apps/evolution-tasks.png
+share/icons/hicolor/22x22/apps/evolution.png
+share/icons/hicolor/24x24/apps/evolution-mail.png
+share/icons/hicolor/24x24/apps/evolution-memos.png
+share/icons/hicolor/24x24/apps/evolution-tasks.png
+share/icons/hicolor/24x24/apps/evolution.png
+share/icons/hicolor/256x256/apps/evolution.png
+share/icons/hicolor/32x32/apps/evolution-mail.png
+share/icons/hicolor/32x32/apps/evolution-memos.png
+share/icons/hicolor/32x32/apps/evolution-tasks.png
+share/icons/hicolor/32x32/apps/evolution.png
+share/icons/hicolor/48x48/apps/evolution-mail.png
+share/icons/hicolor/48x48/apps/evolution-memos.png
+share/icons/hicolor/48x48/apps/evolution-tasks.png
+share/icons/hicolor/48x48/apps/evolution.png
 share/locale/af/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/an/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -5116,10 +5165,10 @@ share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/dz/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en@shaw/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/eo/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -5174,6 +5223,7 @@ share/locale/sr@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/tg/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ug/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -5184,11 +5234,12 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/GConf/gsettings/evolution.convert
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -5223,56 +5274,58 @@ share/GConf/gsettings/evolution.convert
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/help/zh_CN/evolution/figures
-@dirrm share/help/zh_CN/evolution
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@dirrmtry share/help/zh_CN/evolution/figures
+@dirrmtry share/help/zh_CN/evolution
 @dirrmtry share/help/zh_CN
-@dirrm share/help/te/evolution/figures
-@dirrm share/help/te/evolution
+@dirrmtry share/help/te/evolution/figures
+@dirrmtry share/help/te/evolution
 @dirrmtry share/help/te
-@dirrm share/help/sv/evolution/figures
-@dirrm share/help/sv/evolution
+@dirrmtry share/help/sv/evolution/figures
+@dirrmtry share/help/sv/evolution
 @dirrmtry share/help/sv
-@dirrm share/help/sl/evolution/figures
-@dirrm share/help/sl/evolution
+@dirrmtry share/help/sl/evolution/figures
+@dirrmtry share/help/sl/evolution
 @dirrmtry share/help/sl
-@dirrm share/help/ru/evolution/figures
-@dirrm share/help/ru/evolution
+@dirrmtry share/help/ru/evolution/figures
+@dirrmtry share/help/ru/evolution
 @dirrmtry share/help/ru
-@dirrm share/help/oc/evolution/figures
-@dirrm share/help/oc/evolution
+@dirrmtry share/help/oc/evolution/figures
+@dirrmtry share/help/oc/evolution
 @dirrmtry share/help/oc
-@dirrm share/help/mk/evolution/figures
-@dirrm share/help/mk/evolution
+@dirrmtry share/help/mk/evolution/figures
+@dirrmtry share/help/mk/evolution
 @dirrmtry share/help/mk
-@dirrm share/help/hu/evolution/figures
-@dirrm share/help/hu/evolution
+@dirrmtry share/help/hu/evolution/figures
+@dirrmtry share/help/hu/evolution
 @dirrmtry share/help/hu
-@dirrm share/help/gl/evolution/figures
-@dirrm share/help/gl/evolution
+@dirrmtry share/help/gl/evolution/figures
+@dirrmtry share/help/gl/evolution
 @dirrmtry share/help/gl
-@dirrm share/help/fr/evolution/figures
-@dirrm share/help/fr/evolution
+@dirrmtry share/help/fr/evolution/figures
+@dirrmtry share/help/fr/evolution
 @dirrmtry share/help/fr
-@dirrm share/help/eu/evolution/figures
-@dirrm share/help/eu/evolution
+@dirrmtry share/help/eu/evolution/figures
+@dirrmtry share/help/eu/evolution
 @dirrmtry share/help/eu
-@dirrm share/help/es/evolution/figures
-@dirrm share/help/es/evolution
+@dirrmtry share/help/es/evolution/figures
+@dirrmtry share/help/es/evolution
 @dirrmtry share/help/es
-@dirrm share/help/en_GB/evolution/figures
-@dirrm share/help/en_GB/evolution
+@dirrmtry share/help/en_GB/evolution/figures
+@dirrmtry share/help/en_GB/evolution
 @dirrmtry share/help/en_GB
-@dirrm share/help/el/evolution/figures
-@dirrm share/help/el/evolution
+@dirrmtry share/help/el/evolution/figures
+@dirrmtry share/help/el/evolution
 @dirrmtry share/help/el
-@dirrm share/help/de/evolution/figures
-@dirrm share/help/de/evolution
+@dirrmtry share/help/de/evolution/figures
+@dirrmtry share/help/de/evolution
 @dirrmtry share/help/de
-@dirrm share/help/cs/evolution/figures
-@dirrm share/help/cs/evolution
+@dirrmtry share/help/cs/evolution/figures
+@dirrmtry share/help/cs/evolution
 @dirrmtry share/help/cs
-@dirrm share/help/C/evolution/figures
-@dirrm share/help/C/evolution
+@dirrmtry share/help/C/evolution/figures
+@dirrmtry share/help/C/evolution
 @dirrmtry share/help/C
 @dirrmtry share/help
 @dirrm %%DATADIR%%/%%VERSION%%/views/tasks
@@ -5399,24 +5452,22 @@ share/GConf/gsettings/evolution.convert
 @dirrm %%DATADIR%%/%%VERSION%%/default
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
-@dirrm share/doc/eshell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-util
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-shell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-mail-formatter
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-mail-engine
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-mail-composer
+@dirrmtry share/appdata
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/plugins
 @dirrm lib/evolution/%%VERSION%%/modules
 @dirrm lib/evolution/%%VERSION%%
 @dirrm lib/evolution
-@dirrm include/evolution-%%VERSION%%/text
-@dirrm include/evolution-%%VERSION%%/table
 @dirrm include/evolution-%%VERSION%%/shell
-@dirrm include/evolution-%%VERSION%%/misc
-@dirrm include/evolution-%%VERSION%%/menus
 @dirrm include/evolution-%%VERSION%%/mail
 @dirrm include/evolution-%%VERSION%%/libgnomecanvas
-@dirrm include/evolution-%%VERSION%%/libevolution-utils
-@dirrm include/evolution-%%VERSION%%/libemail-utils
 @dirrm include/evolution-%%VERSION%%/libemail-engine
-@dirrm include/evolution-%%VERSION%%/filter
 @dirrm include/evolution-%%VERSION%%/em-format
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/composer