author: Koop Mast <kwm@FreeBSD.org> 2018-09-30 11:58:29 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2018-09-30 11:58:29 +0000
commit: 951c1f5d1c7354f058f5919d858dbb0c174dc73e (patch)
tree: 6146e775343aaf339921799078894a48fef9aa15 /mail
parent: c9b47f0427d70ba42c2d53271f8b64b8e8096825 (diff)
download: ports-951c1f5d1c7354f058f5919d858dbb0c174dc73e.tar.gz
ports-951c1f5d1c7354f058f5919d858dbb0c174dc73e.zip
16 files changed, 355 insertions, 279 deletions
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index da099df05e65..798efd7ab410 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
diff --git a/mail/cyrus-imapd25/files/patch-config.h.in b/mail/cyrus-imapd25/files/patch-config.h.in
new file mode 100644
index 000000000000..3a14c3a60307
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig	2017-05-09 05:22:02.000000000 +0200
++++ config.h.in	2018-04-08 23:58:00.107115000 +0200
+@@ -397,6 +397,9 @@
+ /* Do we have zlib? */
+ #undef HAVE_ZLIB
+ 
++/* Does icaltimetype have is_utc field? */
++#undef ICALTIME_HAS_IS_UTC
++
+ /* Define to the sub-directory where libtool stores uninstalled libraries. */
+ #undef LT_OBJDIR
+ 
diff --git a/mail/cyrus-imapd25/files/patch-configure b/mail/cyrus-imapd25/files/patch-configure
index 4d3deee12dcf..392d60d5bac8 100644
--- a/mail/cyrus-imapd25/files/patch-configure
+++ b/mail/cyrus-imapd25/files/patch-configure
@@ -1,22 +1,18 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	2010-10-18 21:36:00.000000000 +0900
-+++ configure	2010-10-18 23:50:45.966557478 +0900
-@@ -9501,7 +9501,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+--- configure.orig	2017-05-09 05:22:02.000000000 +0200
++++ configure	2018-04-10 21:57:26.402409000 +0200
+@@ -18751,6 +18751,15 @@
+ rm -f conftest*
  
-@@ -9803,7 +9803,7 @@
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-   elif test "$gss_impl" = "heimdal"; then
-     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
--    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries
+ 
++	ac_fn_c_check_member "$LINENO" "icaltimetype" "is_utc" "ac_cv_member_icaltimetype_is_utc" "#include <libical/ical.h>
++"
++if test "x$ac_cv_member_icaltimetype_is_utc" = xyes; then :
++
++$as_echo "#define ICALTIME_HAS_IS_UTC /**/" >>confdefs.h
++
++fi
++
++
+ 	ENABLE_RSCALE=yes
+ 
+ pkg_failed=no
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__caldav.c b/mail/cyrus-imapd25/files/patch-imap_http__caldav.c
new file mode 100644
index 000000000000..363e5046f432
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__caldav.c
@@ -0,0 +1,11 @@
+--- imap/http_caldav.c.orig	2018-04-08 22:00:44 UTC
++++ imap/http_caldav.c
+@@ -2023,7 +2023,7 @@ static struct icaltimetype icaltime_from_rfc3339_strin
+ 	goto fail;
+     }
+ 
+-    tt.is_utc = 1;
++    icaltime_set_utc(&tt, 1);
+     return tt;
+ 
+   fail:
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__dav.h b/mail/cyrus-imapd25/files/patch-imap_http__dav.h
new file mode 100644
index 000000000000..bfc5355d4197
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__dav.h
@@ -0,0 +1,10 @@
+--- imap/http_dav.h.orig	2018-04-10 19:29:50 UTC
++++ imap/http_dav.h
+@@ -628,4 +628,7 @@ int proppatch_todb(xmlNodePtr prop, unsigned set, stru
+ int proppatch_restype(xmlNodePtr prop, unsigned set, struct proppatch_ctx *pctx,
+ 		      struct propstat propstat[], void *rock);
+ 
++/* from upstream imap/ical_support.h need to put it somewhere ... */
++extern void icaltime_set_utc(struct icaltimetype *t, int set);
++
+ #endif /* HTTP_DAV_H */
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__timezone.c b/mail/cyrus-imapd25/files/patch-imap_http__timezone.c
new file mode 100644
index 000000000000..6f4e953054d2
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__timezone.c
@@ -0,0 +1,113 @@
+--- imap/http_timezone.c.orig	2018-04-10 19:19:55 UTC
++++ imap/http_timezone.c
+@@ -388,7 +388,7 @@ static int action_list(struct transaction_t *txn)
+ 	param = hash_lookup("changedsince", &txn->req_qparams);
+ 	if (param) {
+ 	    changedsince = icaltime_from_string(param->s);
+-	    if (param->next || !changedsince.is_utc) {  /* once only, UTC */
++	    if (param->next || !icaltime_is_utc(changedsince)) {  /* once only, UTC */
+ 		return json_error_response(txn, TZ_INVALID_CHANGEDSINCE,
+ 					   param, &changedsince);
+ 	    }
+@@ -396,7 +396,7 @@ static int action_list(struct transaction_t *txn)
+ 
+ 	name = hash_lookup("tzid", &txn->req_qparams);
+ 	if (name) {
+-	    if (changedsince.is_utc) {
++	    if (icaltime_is_utc(changedsince)) {
+ 		return json_error_response(txn, TZ_INVALID_TZID,
+ 					   param, &changedsince);
+ 	    }
+@@ -589,7 +589,7 @@ static const struct observance *truncate_vtimezone(ica
+ 
+ 	/* Adjust DTSTART observance to UTC */
+ 	icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+-	obs.onset.is_utc = 1;
++	icaltime_set_utc(&obs.onset, 1);
+ 
+ 	/* Check DTSTART vs window close */
+ 	if (!icaltime_is_null_time(end) &&
+@@ -651,7 +651,7 @@ static const struct observance *truncate_vtimezone(ica
+ 		if (!infinite) {
+ 		    /* Adjust UNTIL to local time (for iterator) */
+ 		    icaltime_adjust(&rrule.until, 0, 0, 0, obs.offset_from);
+-		    rrule.until.is_utc = 0;
++		    icaltime_set_utc(&rrule.until, 0);
+ 		}
+ 
+ 		if (trunc_dtstart) {
+@@ -675,7 +675,7 @@ static const struct observance *truncate_vtimezone(ica
+ 
+ 		    /* Adjust observance to UTC */
+ 		    icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+-		    obs.onset.is_utc = 1;
++		    icaltime_set_utc(&obs.onset, 1);
+ 
+ 		    if (trunc_until && icaltime_compare(obs.onset, end) > 0) {
+ 			/* Observance is on/after window close */
+@@ -776,7 +776,7 @@ static const struct observance *truncate_vtimezone(ica
+ 
+ 	    /* Adjust observance to UTC */
+ 	    icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+-	    obs.onset.is_utc = 1;
++	    icaltime_set_utc(&obs.onset, 1);
+ 
+ 	    if (!icaltime_is_null_time(end) &&
+ 		icaltime_compare(obs.onset, end) >= 0) {
+@@ -880,7 +880,7 @@ static const struct observance *truncate_vtimezone(ica
+ 	    case ICAL_DTSTART_PROPERTY:
+ 		/* Adjust window open to local time */
+ 		icaltime_adjust(&start, 0, 0, 0, tombstone.offset_from);
+-		start.is_utc = 0;
++		icaltime_set_utc(&start, 1);
+ 
+ 		icalproperty_set_dtstart(prop, start);
+ 		break;
+@@ -1160,7 +1160,7 @@ static int action_expand(struct transaction_t *txn)
+     param = hash_lookup("changedsince", &txn->req_qparams);
+     if (param) {
+ 	changedsince = icaltime_from_string(param->s);
+-	if (param->next || !changedsince.is_utc) {  /* once only, UTC */
++	if (param->next || !icaltime_is_utc(changedsince)) {  /* once only, UTC */
+ 	    return json_error_response(txn, TZ_INVALID_CHANGEDSINCE,
+ 				       param, &changedsince);
+ 	}
+@@ -1171,13 +1171,13 @@ static int action_expand(struct transaction_t *txn)
+ 	return json_error_response(txn, TZ_INVALID_START, param, NULL);
+ 
+     start = icaltime_from_string(param->s);
+-    if (!start.is_utc)  /* MUST be UTC */
++    if (!icaltime_is_utc(start))  /* MUST be UTC */
+ 	return json_error_response(txn, TZ_INVALID_START, param, &start);
+ 
+     param = hash_lookup("end", &txn->req_qparams);
+     if (param) {
+ 	end = icaltime_from_string(param->s);
+-	if (param->next || !end.is_utc  /* once only, UTC */
++	if (param->next || !icaltime_is_utc(end)  /* once only, UTC */
+ 	    || icaltime_compare(end, start) <= 0) {  /* end MUST be > start */
+ 	    return json_error_response(txn, TZ_INVALID_END, param, &end);
+ 	}
+@@ -1435,7 +1435,7 @@ static int json_error_response(struct transaction_t *t
+     else if (param->next) fmt = "multiple %s parameters";
+     else if (!param->s || !param->s[0]) fmt = "missing %s value";
+     else if (!time) fmt = "unknown %s value";
+-    else if (!time->is_utc) fmt = "invalid %s UTC value";
++    else if (!icaltime_is_utc(*time)) fmt = "invalid %s UTC value";
+ 
+     switch (tz_code) {
+     case TZ_INVALID_TZID:
+@@ -1463,4 +1463,13 @@ static int json_error_response(struct transaction_t *t
+     }
+ 
+     return json_response(http_code, txn, root, NULL);
++}
++
++EXPORTED void icaltime_set_utc(struct icaltimetype *t, int set)
++{
++#ifdef ICALTIME_HAS_IS_UTC
++    t->is_utc = set;
++#else
++    icaltime_set_timezone(t, set ? icaltimezone_get_utc_timezone() : NULL);
++#endif
+ }
diff --git a/mail/cyrus-imapd25/files/patch-imap_xcal.c b/mail/cyrus-imapd25/files/patch-imap_xcal.c
new file mode 100644
index 000000000000..fb84058dd3e9
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_xcal.c
@@ -0,0 +1,11 @@
+--- imap/xcal.c.orig	2018-04-10 19:36:14 UTC
++++ imap/xcal.c
+@@ -114,7 +114,7 @@ const char *icaltime_as_iso_string(const struct icalti
+     const char *fmt;
+ 
+     if (tt.is_date) fmt = "%04d-%02d-%02d";
+-    else if (tt.is_utc) fmt = "%04d-%02d-%02dT%02d:%02d:%02dZ";
++    else if (icaltime_is_utc(tt)) fmt = "%04d-%02d-%02dT%02d:%02d:%02dZ";
+     else fmt = "%04d-%02d-%02dT%02d:%02d:%02d";
+ 
+     snprintf(str, sizeof(str), fmt, tt.year, tt.month, tt.day,
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 6caaffbd3e08..67d8635a7edc 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution-ews
-PORTVERSION=	3.24.2
-PORTREVISION=	6
+PORTVERSION=	3.28.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,8 +10,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libfribidi.so:converters/fribidi \
 		libicuuc.so:devel/icu \
 		libmspack.so:archivers/libmspack \
 		libsecret-1.so:security/libsecret \
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index 9856154614d1..ef38ade6262e 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496958885
-SHA256 (gnome3/evolution-ews-3.24.2.tar.xz) = 31eb84a204a50b31932696c03394a7d2563ec2c3eefa52a802e63d0346a28851
-SIZE (gnome3/evolution-ews-3.24.2.tar.xz) = 486848
+TIMESTAMP = 1529614124
+SHA256 (gnome3/evolution-ews-3.28.3.tar.xz) = 6c440ea4bd37bc33d31b29b8ff8c6c84fdf473bdb8b587aafa635ebad458df90
+SIZE (gnome3/evolution-ews-3.28.3.tar.xz) = 504756
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index 706412eb157c..6de5051b4737 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -6,7 +6,6 @@ lib/evolution-data-server/registry-modules/module-ews-backend.so
 lib/evolution-ews/libcamelews-priv.so
 lib/evolution-ews/libevolution-ews.so
 lib/evolution/modules/module-ews-configuration.so
-share/appdata/evolution-ews.metainfo.xml
 share/evolution-data-server/ews/windowsZones.xml
 share/evolution/errors/module-ews-configuration.error
 share/locale/as/LC_MESSAGES/evolution-ews.mo
@@ -46,3 +45,4 @@ share/locale/ta/LC_MESSAGES/evolution-ews.mo
 share/locale/te/LC_MESSAGES/evolution-ews.mo
 share/locale/tr/LC_MESSAGES/evolution-ews.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-ews.mo
+share/metainfo/org.gnome.Evolution-ews.metainfo.xml
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2876fdbac727..09d57325f3ef 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution
-PORTVERSION=	3.24.2
-PORTREVISION=	6
+PORTVERSION=	3.28.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -31,6 +30,8 @@ LIB_DEPENDS=	libnss3.so:security/nss \
 		libical.so:devel/libical \
 		libsecret-1.so:security/libsecret \
 		libenchant.so:textproc/enchant \
+		libenchant-2.so:textproc/enchant2 \
+		libfribidi.so:converters/fribidi \
 		libp11-kit.so:security/p11-kit \
 		libcryptui.so:security/libcryptui \
 		libdbus-1.so:devel/dbus \
@@ -50,16 +51,15 @@ USE_XORG=	x11
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DENABLE_TEXT_HIGHLIGHT=YES \
+		-DWITH_ENCHANT_VERSION=2 \
 		-DVERSION_COMMENT="FreeBSD GNOME Team"
 
-GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
-		org.gnome.evolution.addressbook.gschema.xml \
+GLIB_SCHEMAS=	org.gnome.evolution.addressbook.gschema.xml \
+		org.gnome.evolution.bogofilter.gschema.xml \
 		org.gnome.evolution.calendar.gschema.xml \
+		org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.importer.gschema.xml \
 		org.gnome.evolution.mail.gschema.xml \
-		org.gnome.evolution.shell.gschema.xml \
-		org.gnome.evolution.bogofilter.gschema.xml \
-		org.gnome.evolution.spamassassin.gschema.xml \
 		org.gnome.evolution.plugin.attachment-reminder.gschema.xml \
 		org.gnome.evolution.plugin.autocontacts.gschema.xml \
 		org.gnome.evolution.plugin.email-custom-header.gschema.xml \
@@ -69,7 +69,10 @@ GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.plugin.mail-notification.gschema.xml \
 		org.gnome.evolution.plugin.prefer-plain.gschema.xml \
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
-		org.gnome.evolution.plugin.templates.gschema.xml
+		org.gnome.evolution.plugin.templates.gschema.xml \
+		org.gnome.evolution.shell.gschema.xml \
+		org.gnome.evolution.spamassassin.gschema.xml \
+		org.gnome.evolution.text-highlight.gschema.xml
 
 EVO_VERSION=	3.24
 PLIST_SUB=	VERSION=${EVO_VERSION} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 316734e82d0c..5150c430f571 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496947688
-SHA256 (gnome3/evolution-3.24.2.tar.xz) = e7b35a60f4ad53bb5416d8e96390aa79c8601b09a71e635c1de730b94f3aebdf
-SIZE (gnome3/evolution-3.24.2.tar.xz) = 12132032
+TIMESTAMP = 1529613519
+SHA256 (gnome3/evolution-3.28.3.tar.xz) = d374511b7866df399c30458b92ac59a24cd5517c0f3a541d72010bc1eca73be8
+SIZE (gnome3/evolution-3.28.3.tar.xz) = 12113760
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index d6aeb38737f5..bb50a2581471 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,5 @@
 bin/evolution
-etc/xdg/autostart/evolution-alarm-notify.desktop
+etc/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
 include/evolution/addressbook/gui/widgets/eab-config.h
 include/evolution/calendar/gui/calendar-config-keys.h
 include/evolution/calendar/gui/calendar-config.h
@@ -52,6 +52,7 @@ include/evolution/calendar/gui/e-select-names-renderer.h
 include/evolution/calendar/gui/e-send-options-utils.h
 include/evolution/calendar/gui/e-task-table.h
 include/evolution/calendar/gui/e-timezone-entry.h
+include/evolution/calendar/gui/e-to-do-pane.h
 include/evolution/calendar/gui/e-week-view-event-item.h
 include/evolution/calendar/gui/e-week-view-layout.h
 include/evolution/calendar/gui/e-week-view-main-item.h
@@ -84,6 +85,7 @@ include/evolution/composer/e-composer-private.h
 include/evolution/composer/e-composer-spell-header.h
 include/evolution/composer/e-composer-text-header.h
 include/evolution/composer/e-msg-composer.h
+include/evolution/e-util/e-accounts-window.h
 include/evolution/e-util/e-action-combo-box.h
 include/evolution/e-util/e-activity-bar.h
 include/evolution/e-util/e-activity-proxy.h
@@ -142,8 +144,13 @@ include/evolution/e-util/e-charset.h
 include/evolution/e-util/e-client-cache.h
 include/evolution/e-util/e-client-combo-box.h
 include/evolution/e-util/e-client-selector.h
+include/evolution/e-util/e-collection-account-wizard.h
 include/evolution/e-util/e-color-chooser-widget.h
 include/evolution/e-util/e-color-combo.h
+include/evolution/e-util/e-config-lookup-result-simple.h
+include/evolution/e-util/e-config-lookup-result.h
+include/evolution/e-util/e-config-lookup-worker.h
+include/evolution/e-util/e-config-lookup.h
 include/evolution/e-util/e-config.h
 include/evolution/e-util/e-conflict-search-selector.h
 include/evolution/e-util/e-contact-store.h
@@ -315,6 +322,7 @@ include/evolution/e-util/e-util-enumtypes.h
 include/evolution/e-util/e-util.h
 include/evolution/e-util/e-web-view-preview.h
 include/evolution/e-util/e-web-view.h
+include/evolution/e-util/e-webdav-browser.h
 include/evolution/e-util/e-widget-undo.h
 include/evolution/e-util/e-xml-utils.h
 include/evolution/e-util/ea-calendar-cell.h
@@ -368,8 +376,6 @@ include/evolution/em-format/e-mail-part-utils.h
 include/evolution/em-format/e-mail-part.h
 include/evolution/em-format/e-mail-stripsig-filter.h
 include/evolution/libemail-engine/camel-null-store.h
-include/evolution/libemail-engine/camel-sasl-oauth2-google.h
-include/evolution/libemail-engine/camel-sasl-xoauth2.h
 include/evolution/libemail-engine/e-mail-engine-enums.h
 include/evolution/libemail-engine/e-mail-engine-enumtypes.h
 include/evolution/libemail-engine/e-mail-folder-utils.h
@@ -416,6 +422,7 @@ include/evolution/mail/e-mail-browser.h
 include/evolution/mail/e-mail-config-activity-page.h
 include/evolution/mail/e-mail-config-assistant.h
 include/evolution/mail/e-mail-config-auth-check.h
+include/evolution/mail/e-mail-config-composing-page.h
 include/evolution/mail/e-mail-config-confirm-page.h
 include/evolution/mail/e-mail-config-defaults-page.h
 include/evolution/mail/e-mail-config-identity-page.h
@@ -519,6 +526,7 @@ lib/evolution/libevolution-shell.so
 lib/evolution/libevolution-smime.so
 lib/evolution/libevolution-util.so
 lib/evolution/libgnomecanvas.so
+lib/evolution/modules/module-accounts-window.so
 lib/evolution/modules/module-addressbook.so
 lib/evolution/modules/module-backup-restore.so
 %%BOGOFILTER%%lib/evolution/modules/module-bogofilter.so
@@ -535,6 +543,7 @@ lib/evolution/modules/module-cal-config-webcal.so
 lib/evolution/modules/module-calendar.so
 lib/evolution/modules/module-composer-autosave.so
 lib/evolution/modules/module-composer-to-meeting.so
+lib/evolution/modules/module-config-lookup.so
 lib/evolution/modules/module-contact-photos.so
 lib/evolution/modules/module-gravatar.so
 lib/evolution/modules/module-itip-formatter.so
@@ -593,11 +602,7 @@ libexec/evolution/evolution-alarm-notify
 libexec/evolution/evolution-backup
 libexec/evolution/killev
 share/GConf/gsettings/evolution.convert
-%%BOGOFILTER%%share/appdata/evolution-bogofilter.metainfo.xml
-%%PST%%share/appdata/evolution-pst.metainfo.xml
-%%SPAMASSASSIN%%share/appdata/evolution-spamassassin.metainfo.xml
-share/appdata/evolution.appdata.xml
-share/applications/evolution.desktop
+share/applications/org.gnome.Evolution.desktop
 %%DATADIR%%/address_formats.dat
 %%DATADIR%%/addresstypes.xml
 %%DATADIR%%/caltypes.xml
@@ -914,7 +919,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-switcher-appearance.page
 share/help/C/evolution/contacts-add-automatically.page
 share/help/C/evolution/contacts-autocompletion.page
 share/help/C/evolution/contacts-google.page
@@ -930,13 +934,12 @@ share/help/C/evolution/contacts-usage.page
 share/help/C/evolution/contacts-using-contact-lists.page
 share/help/C/evolution/contacts-using-several-addressbooks.page
 share/help/C/evolution/credits.page
+share/help/C/evolution/customize-ui-items.page
 share/help/C/evolution/data-storage.page
 share/help/C/evolution/default-browser.page
 share/help/C/evolution/deleting-appointments.page
 share/help/C/evolution/deleting-emails.page
 share/help/C/evolution/deleting-to-free-disk-space.page
-share/help/C/evolution/exchange-connectors-overview.page
-share/help/C/evolution/exchange-placeholder.page
 share/help/C/evolution/exporting-data-calendar.page
 share/help/C/evolution/exporting-data-contacts.page
 share/help/C/evolution/exporting-data-mail.page
@@ -970,6 +973,7 @@ share/help/C/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -1053,7 +1057,6 @@ share/help/C/evolution/mail-moving-emails.page
 share/help/C/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/C/evolution/mail-receiving-options-exchange-mapi.page
@@ -1066,13 +1069,10 @@ share/help/C/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/C/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/C/evolution/mail-receiving-options-usenet-news.page
 share/help/C/evolution/mail-receiving-options.page
-share/help/C/evolution/mail-recognized-thread-related-headers.page
 share/help/C/evolution/mail-refresh-folders.page
 share/help/C/evolution/mail-save-as-pdf.page
 share/help/C/evolution/mail-search-folders-add.page
 share/help/C/evolution/mail-search-folders-conditions.page
-share/help/C/evolution/mail-search-folders-enable.page
-share/help/C/evolution/mail-search-folders-refresh.page
 share/help/C/evolution/mail-search-folders.page
 share/help/C/evolution/mail-searching-attachment-type.page
 share/help/C/evolution/mail-searching.page
@@ -1146,7 +1146,6 @@ share/help/ca/evolution/calendar-usage.page
 share/help/ca/evolution/calendar-using-several-calendars.page
 share/help/ca/evolution/calendar-weather.page
 share/help/ca/evolution/calendar-webdav.page
-share/help/ca/evolution/change-switcher-appearance.page
 share/help/ca/evolution/contacts-add-automatically.page
 share/help/ca/evolution/contacts-autocompletion.page
 share/help/ca/evolution/contacts-google.page
@@ -1162,13 +1161,12 @@ share/help/ca/evolution/contacts-usage.page
 share/help/ca/evolution/contacts-using-contact-lists.page
 share/help/ca/evolution/contacts-using-several-addressbooks.page
 share/help/ca/evolution/credits.page
+share/help/ca/evolution/customize-ui-items.page
 share/help/ca/evolution/data-storage.page
 share/help/ca/evolution/default-browser.page
 share/help/ca/evolution/deleting-appointments.page
 share/help/ca/evolution/deleting-emails.page
 share/help/ca/evolution/deleting-to-free-disk-space.page
-share/help/ca/evolution/exchange-connectors-overview.page
-share/help/ca/evolution/exchange-placeholder.page
 share/help/ca/evolution/exporting-data-calendar.page
 share/help/ca/evolution/exporting-data-contacts.page
 share/help/ca/evolution/exporting-data-mail.page
@@ -1202,6 +1200,7 @@ share/help/ca/evolution/import-supported-file-formats.page
 share/help/ca/evolution/index.page
 share/help/ca/evolution/intro-application.page
 share/help/ca/evolution/intro-first-run.page
+share/help/ca/evolution/intro-keyboard-shortcuts.page
 share/help/ca/evolution/intro-main-window.page
 share/help/ca/evolution/legal.xml
 share/help/ca/evolution/mail-access-gmail-imap-account.page
@@ -1285,7 +1284,6 @@ share/help/ca/evolution/mail-moving-emails.page
 share/help/ca/evolution/mail-not-sent.page
 share/help/ca/evolution/mail-organizing.page
 share/help/ca/evolution/mail-read-receipts.page
-share/help/ca/evolution/mail-reading-keyboard-shortcuts.page
 share/help/ca/evolution/mail-received-notification.page
 share/help/ca/evolution/mail-receiving-options-exchange-ews.page
 share/help/ca/evolution/mail-receiving-options-exchange-mapi.page
@@ -1298,13 +1296,10 @@ share/help/ca/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/ca/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/ca/evolution/mail-receiving-options-usenet-news.page
 share/help/ca/evolution/mail-receiving-options.page
-share/help/ca/evolution/mail-recognized-thread-related-headers.page
 share/help/ca/evolution/mail-refresh-folders.page
 share/help/ca/evolution/mail-save-as-pdf.page
 share/help/ca/evolution/mail-search-folders-add.page
 share/help/ca/evolution/mail-search-folders-conditions.page
-share/help/ca/evolution/mail-search-folders-enable.page
-share/help/ca/evolution/mail-search-folders-refresh.page
 share/help/ca/evolution/mail-search-folders.page
 share/help/ca/evolution/mail-searching-attachment-type.page
 share/help/ca/evolution/mail-searching.page
@@ -1378,7 +1373,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-switcher-appearance.page
 share/help/cs/evolution/contacts-add-automatically.page
 share/help/cs/evolution/contacts-autocompletion.page
 share/help/cs/evolution/contacts-google.page
@@ -1394,13 +1388,12 @@ share/help/cs/evolution/contacts-usage.page
 share/help/cs/evolution/contacts-using-contact-lists.page
 share/help/cs/evolution/contacts-using-several-addressbooks.page
 share/help/cs/evolution/credits.page
+share/help/cs/evolution/customize-ui-items.page
 share/help/cs/evolution/data-storage.page
 share/help/cs/evolution/default-browser.page
 share/help/cs/evolution/deleting-appointments.page
 share/help/cs/evolution/deleting-emails.page
 share/help/cs/evolution/deleting-to-free-disk-space.page
-share/help/cs/evolution/exchange-connectors-overview.page
-share/help/cs/evolution/exchange-placeholder.page
 share/help/cs/evolution/exporting-data-calendar.page
 share/help/cs/evolution/exporting-data-contacts.page
 share/help/cs/evolution/exporting-data-mail.page
@@ -1434,6 +1427,7 @@ share/help/cs/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -1517,7 +1511,6 @@ share/help/cs/evolution/mail-moving-emails.page
 share/help/cs/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/cs/evolution/mail-receiving-options-exchange-mapi.page
@@ -1530,13 +1523,10 @@ share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/cs/evolution/mail-receiving-options-usenet-news.page
 share/help/cs/evolution/mail-receiving-options.page
-share/help/cs/evolution/mail-recognized-thread-related-headers.page
 share/help/cs/evolution/mail-refresh-folders.page
 share/help/cs/evolution/mail-save-as-pdf.page
 share/help/cs/evolution/mail-search-folders-add.page
 share/help/cs/evolution/mail-search-folders-conditions.page
-share/help/cs/evolution/mail-search-folders-enable.page
-share/help/cs/evolution/mail-search-folders-refresh.page
 share/help/cs/evolution/mail-search-folders.page
 share/help/cs/evolution/mail-searching-attachment-type.page
 share/help/cs/evolution/mail-searching.page
@@ -1610,7 +1600,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-switcher-appearance.page
 share/help/de/evolution/contacts-add-automatically.page
 share/help/de/evolution/contacts-autocompletion.page
 share/help/de/evolution/contacts-google.page
@@ -1626,13 +1615,12 @@ share/help/de/evolution/contacts-usage.page
 share/help/de/evolution/contacts-using-contact-lists.page
 share/help/de/evolution/contacts-using-several-addressbooks.page
 share/help/de/evolution/credits.page
+share/help/de/evolution/customize-ui-items.page
 share/help/de/evolution/data-storage.page
 share/help/de/evolution/default-browser.page
 share/help/de/evolution/deleting-appointments.page
 share/help/de/evolution/deleting-emails.page
 share/help/de/evolution/deleting-to-free-disk-space.page
-share/help/de/evolution/exchange-connectors-overview.page
-share/help/de/evolution/exchange-placeholder.page
 share/help/de/evolution/exporting-data-calendar.page
 share/help/de/evolution/exporting-data-contacts.page
 share/help/de/evolution/exporting-data-mail.page
@@ -1666,6 +1654,7 @@ share/help/de/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -1749,7 +1738,6 @@ share/help/de/evolution/mail-moving-emails.page
 share/help/de/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/de/evolution/mail-receiving-options-exchange-mapi.page
@@ -1762,13 +1750,10 @@ share/help/de/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/de/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/de/evolution/mail-receiving-options-usenet-news.page
 share/help/de/evolution/mail-receiving-options.page
-share/help/de/evolution/mail-recognized-thread-related-headers.page
 share/help/de/evolution/mail-refresh-folders.page
 share/help/de/evolution/mail-save-as-pdf.page
 share/help/de/evolution/mail-search-folders-add.page
 share/help/de/evolution/mail-search-folders-conditions.page
-share/help/de/evolution/mail-search-folders-enable.page
-share/help/de/evolution/mail-search-folders-refresh.page
 share/help/de/evolution/mail-search-folders.page
 share/help/de/evolution/mail-searching-attachment-type.page
 share/help/de/evolution/mail-searching.page
@@ -1842,7 +1827,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-switcher-appearance.page
 share/help/el/evolution/contacts-add-automatically.page
 share/help/el/evolution/contacts-autocompletion.page
 share/help/el/evolution/contacts-google.page
@@ -1858,13 +1842,12 @@ share/help/el/evolution/contacts-usage.page
 share/help/el/evolution/contacts-using-contact-lists.page
 share/help/el/evolution/contacts-using-several-addressbooks.page
 share/help/el/evolution/credits.page
+share/help/el/evolution/customize-ui-items.page
 share/help/el/evolution/data-storage.page
 share/help/el/evolution/default-browser.page
 share/help/el/evolution/deleting-appointments.page
 share/help/el/evolution/deleting-emails.page
 share/help/el/evolution/deleting-to-free-disk-space.page
-share/help/el/evolution/exchange-connectors-overview.page
-share/help/el/evolution/exchange-placeholder.page
 share/help/el/evolution/exporting-data-calendar.page
 share/help/el/evolution/exporting-data-contacts.page
 share/help/el/evolution/exporting-data-mail.page
@@ -1898,6 +1881,7 @@ share/help/el/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -1981,7 +1965,6 @@ share/help/el/evolution/mail-moving-emails.page
 share/help/el/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/el/evolution/mail-receiving-options-exchange-mapi.page
@@ -1994,13 +1977,10 @@ share/help/el/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/el/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/el/evolution/mail-receiving-options-usenet-news.page
 share/help/el/evolution/mail-receiving-options.page
-share/help/el/evolution/mail-recognized-thread-related-headers.page
 share/help/el/evolution/mail-refresh-folders.page
 share/help/el/evolution/mail-save-as-pdf.page
 share/help/el/evolution/mail-search-folders-add.page
 share/help/el/evolution/mail-search-folders-conditions.page
-share/help/el/evolution/mail-search-folders-enable.page
-share/help/el/evolution/mail-search-folders-refresh.page
 share/help/el/evolution/mail-search-folders.page
 share/help/el/evolution/mail-searching-attachment-type.page
 share/help/el/evolution/mail-searching.page
@@ -2074,7 +2054,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-switcher-appearance.page
 share/help/en_GB/evolution/contacts-add-automatically.page
 share/help/en_GB/evolution/contacts-autocompletion.page
 share/help/en_GB/evolution/contacts-google.page
@@ -2090,13 +2069,12 @@ share/help/en_GB/evolution/contacts-usage.page
 share/help/en_GB/evolution/contacts-using-contact-lists.page
 share/help/en_GB/evolution/contacts-using-several-addressbooks.page
 share/help/en_GB/evolution/credits.page
+share/help/en_GB/evolution/customize-ui-items.page
 share/help/en_GB/evolution/data-storage.page
 share/help/en_GB/evolution/default-browser.page
 share/help/en_GB/evolution/deleting-appointments.page
 share/help/en_GB/evolution/deleting-emails.page
 share/help/en_GB/evolution/deleting-to-free-disk-space.page
-share/help/en_GB/evolution/exchange-connectors-overview.page
-share/help/en_GB/evolution/exchange-placeholder.page
 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
@@ -2130,6 +2108,7 @@ share/help/en_GB/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -2213,7 +2192,6 @@ share/help/en_GB/evolution/mail-moving-emails.page
 share/help/en_GB/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/en_GB/evolution/mail-receiving-options-exchange-mapi.page
@@ -2226,13 +2204,10 @@ 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
 share/help/en_GB/evolution/mail-receiving-options-usenet-news.page
 share/help/en_GB/evolution/mail-receiving-options.page
-share/help/en_GB/evolution/mail-recognized-thread-related-headers.page
 share/help/en_GB/evolution/mail-refresh-folders.page
 share/help/en_GB/evolution/mail-save-as-pdf.page
 share/help/en_GB/evolution/mail-search-folders-add.page
 share/help/en_GB/evolution/mail-search-folders-conditions.page
-share/help/en_GB/evolution/mail-search-folders-enable.page
-share/help/en_GB/evolution/mail-search-folders-refresh.page
 share/help/en_GB/evolution/mail-search-folders.page
 share/help/en_GB/evolution/mail-searching-attachment-type.page
 share/help/en_GB/evolution/mail-searching.page
@@ -2306,7 +2281,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-switcher-appearance.page
 share/help/es/evolution/contacts-add-automatically.page
 share/help/es/evolution/contacts-autocompletion.page
 share/help/es/evolution/contacts-google.page
@@ -2322,13 +2296,12 @@ share/help/es/evolution/contacts-usage.page
 share/help/es/evolution/contacts-using-contact-lists.page
 share/help/es/evolution/contacts-using-several-addressbooks.page
 share/help/es/evolution/credits.page
+share/help/es/evolution/customize-ui-items.page
 share/help/es/evolution/data-storage.page
 share/help/es/evolution/default-browser.page
 share/help/es/evolution/deleting-appointments.page
 share/help/es/evolution/deleting-emails.page
 share/help/es/evolution/deleting-to-free-disk-space.page
-share/help/es/evolution/exchange-connectors-overview.page
-share/help/es/evolution/exchange-placeholder.page
 share/help/es/evolution/exporting-data-calendar.page
 share/help/es/evolution/exporting-data-contacts.page
 share/help/es/evolution/exporting-data-mail.page
@@ -2362,6 +2335,7 @@ share/help/es/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -2445,7 +2419,6 @@ share/help/es/evolution/mail-moving-emails.page
 share/help/es/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/es/evolution/mail-receiving-options-exchange-mapi.page
@@ -2458,13 +2431,10 @@ share/help/es/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/es/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/es/evolution/mail-receiving-options-usenet-news.page
 share/help/es/evolution/mail-receiving-options.page
-share/help/es/evolution/mail-recognized-thread-related-headers.page
 share/help/es/evolution/mail-refresh-folders.page
 share/help/es/evolution/mail-save-as-pdf.page
 share/help/es/evolution/mail-search-folders-add.page
 share/help/es/evolution/mail-search-folders-conditions.page
-share/help/es/evolution/mail-search-folders-enable.page
-share/help/es/evolution/mail-search-folders-refresh.page
 share/help/es/evolution/mail-search-folders.page
 share/help/es/evolution/mail-searching-attachment-type.page
 share/help/es/evolution/mail-searching.page
@@ -2538,7 +2508,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-switcher-appearance.page
 share/help/eu/evolution/contacts-add-automatically.page
 share/help/eu/evolution/contacts-autocompletion.page
 share/help/eu/evolution/contacts-google.page
@@ -2554,13 +2523,12 @@ share/help/eu/evolution/contacts-usage.page
 share/help/eu/evolution/contacts-using-contact-lists.page
 share/help/eu/evolution/contacts-using-several-addressbooks.page
 share/help/eu/evolution/credits.page
+share/help/eu/evolution/customize-ui-items.page
 share/help/eu/evolution/data-storage.page
 share/help/eu/evolution/default-browser.page
 share/help/eu/evolution/deleting-appointments.page
 share/help/eu/evolution/deleting-emails.page
 share/help/eu/evolution/deleting-to-free-disk-space.page
-share/help/eu/evolution/exchange-connectors-overview.page
-share/help/eu/evolution/exchange-placeholder.page
 share/help/eu/evolution/exporting-data-calendar.page
 share/help/eu/evolution/exporting-data-contacts.page
 share/help/eu/evolution/exporting-data-mail.page
@@ -2594,6 +2562,7 @@ share/help/eu/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -2677,7 +2646,6 @@ share/help/eu/evolution/mail-moving-emails.page
 share/help/eu/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/eu/evolution/mail-receiving-options-exchange-mapi.page
@@ -2690,13 +2658,10 @@ share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/eu/evolution/mail-receiving-options-usenet-news.page
 share/help/eu/evolution/mail-receiving-options.page
-share/help/eu/evolution/mail-recognized-thread-related-headers.page
 share/help/eu/evolution/mail-refresh-folders.page
 share/help/eu/evolution/mail-save-as-pdf.page
 share/help/eu/evolution/mail-search-folders-add.page
 share/help/eu/evolution/mail-search-folders-conditions.page
-share/help/eu/evolution/mail-search-folders-enable.page
-share/help/eu/evolution/mail-search-folders-refresh.page
 share/help/eu/evolution/mail-search-folders.page
 share/help/eu/evolution/mail-searching-attachment-type.page
 share/help/eu/evolution/mail-searching.page
@@ -2770,7 +2735,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-switcher-appearance.page
 share/help/fr/evolution/contacts-add-automatically.page
 share/help/fr/evolution/contacts-autocompletion.page
 share/help/fr/evolution/contacts-google.page
@@ -2786,13 +2750,12 @@ share/help/fr/evolution/contacts-usage.page
 share/help/fr/evolution/contacts-using-contact-lists.page
 share/help/fr/evolution/contacts-using-several-addressbooks.page
 share/help/fr/evolution/credits.page
+share/help/fr/evolution/customize-ui-items.page
 share/help/fr/evolution/data-storage.page
 share/help/fr/evolution/default-browser.page
 share/help/fr/evolution/deleting-appointments.page
 share/help/fr/evolution/deleting-emails.page
 share/help/fr/evolution/deleting-to-free-disk-space.page
-share/help/fr/evolution/exchange-connectors-overview.page
-share/help/fr/evolution/exchange-placeholder.page
 share/help/fr/evolution/exporting-data-calendar.page
 share/help/fr/evolution/exporting-data-contacts.page
 share/help/fr/evolution/exporting-data-mail.page
@@ -2826,6 +2789,7 @@ share/help/fr/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -2909,7 +2873,6 @@ share/help/fr/evolution/mail-moving-emails.page
 share/help/fr/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/fr/evolution/mail-receiving-options-exchange-mapi.page
@@ -2922,13 +2885,10 @@ share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/fr/evolution/mail-receiving-options-usenet-news.page
 share/help/fr/evolution/mail-receiving-options.page
-share/help/fr/evolution/mail-recognized-thread-related-headers.page
 share/help/fr/evolution/mail-refresh-folders.page
 share/help/fr/evolution/mail-save-as-pdf.page
 share/help/fr/evolution/mail-search-folders-add.page
 share/help/fr/evolution/mail-search-folders-conditions.page
-share/help/fr/evolution/mail-search-folders-enable.page
-share/help/fr/evolution/mail-search-folders-refresh.page
 share/help/fr/evolution/mail-search-folders.page
 share/help/fr/evolution/mail-searching-attachment-type.page
 share/help/fr/evolution/mail-searching.page
@@ -3002,7 +2962,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-switcher-appearance.page
 share/help/gl/evolution/contacts-add-automatically.page
 share/help/gl/evolution/contacts-autocompletion.page
 share/help/gl/evolution/contacts-google.page
@@ -3018,13 +2977,12 @@ share/help/gl/evolution/contacts-usage.page
 share/help/gl/evolution/contacts-using-contact-lists.page
 share/help/gl/evolution/contacts-using-several-addressbooks.page
 share/help/gl/evolution/credits.page
+share/help/gl/evolution/customize-ui-items.page
 share/help/gl/evolution/data-storage.page
 share/help/gl/evolution/default-browser.page
 share/help/gl/evolution/deleting-appointments.page
 share/help/gl/evolution/deleting-emails.page
 share/help/gl/evolution/deleting-to-free-disk-space.page
-share/help/gl/evolution/exchange-connectors-overview.page
-share/help/gl/evolution/exchange-placeholder.page
 share/help/gl/evolution/exporting-data-calendar.page
 share/help/gl/evolution/exporting-data-contacts.page
 share/help/gl/evolution/exporting-data-mail.page
@@ -3058,6 +3016,7 @@ share/help/gl/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -3141,7 +3100,6 @@ share/help/gl/evolution/mail-moving-emails.page
 share/help/gl/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/gl/evolution/mail-receiving-options-exchange-mapi.page
@@ -3154,13 +3112,10 @@ share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/gl/evolution/mail-receiving-options-usenet-news.page
 share/help/gl/evolution/mail-receiving-options.page
-share/help/gl/evolution/mail-recognized-thread-related-headers.page
 share/help/gl/evolution/mail-refresh-folders.page
 share/help/gl/evolution/mail-save-as-pdf.page
 share/help/gl/evolution/mail-search-folders-add.page
 share/help/gl/evolution/mail-search-folders-conditions.page
-share/help/gl/evolution/mail-search-folders-enable.page
-share/help/gl/evolution/mail-search-folders-refresh.page
 share/help/gl/evolution/mail-search-folders.page
 share/help/gl/evolution/mail-searching-attachment-type.page
 share/help/gl/evolution/mail-searching.page
@@ -3234,7 +3189,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-switcher-appearance.page
 share/help/hu/evolution/contacts-add-automatically.page
 share/help/hu/evolution/contacts-autocompletion.page
 share/help/hu/evolution/contacts-google.page
@@ -3250,13 +3204,12 @@ share/help/hu/evolution/contacts-usage.page
 share/help/hu/evolution/contacts-using-contact-lists.page
 share/help/hu/evolution/contacts-using-several-addressbooks.page
 share/help/hu/evolution/credits.page
+share/help/hu/evolution/customize-ui-items.page
 share/help/hu/evolution/data-storage.page
 share/help/hu/evolution/default-browser.page
 share/help/hu/evolution/deleting-appointments.page
 share/help/hu/evolution/deleting-emails.page
 share/help/hu/evolution/deleting-to-free-disk-space.page
-share/help/hu/evolution/exchange-connectors-overview.page
-share/help/hu/evolution/exchange-placeholder.page
 share/help/hu/evolution/exporting-data-calendar.page
 share/help/hu/evolution/exporting-data-contacts.page
 share/help/hu/evolution/exporting-data-mail.page
@@ -3290,6 +3243,7 @@ share/help/hu/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -3373,7 +3327,6 @@ share/help/hu/evolution/mail-moving-emails.page
 share/help/hu/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/hu/evolution/mail-receiving-options-exchange-mapi.page
@@ -3386,13 +3339,10 @@ share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/hu/evolution/mail-receiving-options-usenet-news.page
 share/help/hu/evolution/mail-receiving-options.page
-share/help/hu/evolution/mail-recognized-thread-related-headers.page
 share/help/hu/evolution/mail-refresh-folders.page
 share/help/hu/evolution/mail-save-as-pdf.page
 share/help/hu/evolution/mail-search-folders-add.page
 share/help/hu/evolution/mail-search-folders-conditions.page
-share/help/hu/evolution/mail-search-folders-enable.page
-share/help/hu/evolution/mail-search-folders-refresh.page
 share/help/hu/evolution/mail-search-folders.page
 share/help/hu/evolution/mail-searching-attachment-type.page
 share/help/hu/evolution/mail-searching.page
@@ -3466,7 +3416,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-switcher-appearance.page
 share/help/mk/evolution/contacts-add-automatically.page
 share/help/mk/evolution/contacts-autocompletion.page
 share/help/mk/evolution/contacts-google.page
@@ -3482,13 +3431,12 @@ share/help/mk/evolution/contacts-usage.page
 share/help/mk/evolution/contacts-using-contact-lists.page
 share/help/mk/evolution/contacts-using-several-addressbooks.page
 share/help/mk/evolution/credits.page
+share/help/mk/evolution/customize-ui-items.page
 share/help/mk/evolution/data-storage.page
 share/help/mk/evolution/default-browser.page
 share/help/mk/evolution/deleting-appointments.page
 share/help/mk/evolution/deleting-emails.page
 share/help/mk/evolution/deleting-to-free-disk-space.page
-share/help/mk/evolution/exchange-connectors-overview.page
-share/help/mk/evolution/exchange-placeholder.page
 share/help/mk/evolution/exporting-data-calendar.page
 share/help/mk/evolution/exporting-data-contacts.page
 share/help/mk/evolution/exporting-data-mail.page
@@ -3522,6 +3470,7 @@ share/help/mk/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -3605,7 +3554,6 @@ share/help/mk/evolution/mail-moving-emails.page
 share/help/mk/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/mk/evolution/mail-receiving-options-exchange-mapi.page
@@ -3618,13 +3566,10 @@ share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/mk/evolution/mail-receiving-options-usenet-news.page
 share/help/mk/evolution/mail-receiving-options.page
-share/help/mk/evolution/mail-recognized-thread-related-headers.page
 share/help/mk/evolution/mail-refresh-folders.page
 share/help/mk/evolution/mail-save-as-pdf.page
 share/help/mk/evolution/mail-search-folders-add.page
 share/help/mk/evolution/mail-search-folders-conditions.page
-share/help/mk/evolution/mail-search-folders-enable.page
-share/help/mk/evolution/mail-search-folders-refresh.page
 share/help/mk/evolution/mail-search-folders.page
 share/help/mk/evolution/mail-searching-attachment-type.page
 share/help/mk/evolution/mail-searching.page
@@ -3698,7 +3643,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-switcher-appearance.page
 share/help/oc/evolution/contacts-add-automatically.page
 share/help/oc/evolution/contacts-autocompletion.page
 share/help/oc/evolution/contacts-google.page
@@ -3714,13 +3658,12 @@ share/help/oc/evolution/contacts-usage.page
 share/help/oc/evolution/contacts-using-contact-lists.page
 share/help/oc/evolution/contacts-using-several-addressbooks.page
 share/help/oc/evolution/credits.page
+share/help/oc/evolution/customize-ui-items.page
 share/help/oc/evolution/data-storage.page
 share/help/oc/evolution/default-browser.page
 share/help/oc/evolution/deleting-appointments.page
 share/help/oc/evolution/deleting-emails.page
 share/help/oc/evolution/deleting-to-free-disk-space.page
-share/help/oc/evolution/exchange-connectors-overview.page
-share/help/oc/evolution/exchange-placeholder.page
 share/help/oc/evolution/exporting-data-calendar.page
 share/help/oc/evolution/exporting-data-contacts.page
 share/help/oc/evolution/exporting-data-mail.page
@@ -3754,6 +3697,7 @@ share/help/oc/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -3837,7 +3781,6 @@ share/help/oc/evolution/mail-moving-emails.page
 share/help/oc/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/oc/evolution/mail-receiving-options-exchange-mapi.page
@@ -3850,13 +3793,10 @@ share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/oc/evolution/mail-receiving-options-usenet-news.page
 share/help/oc/evolution/mail-receiving-options.page
-share/help/oc/evolution/mail-recognized-thread-related-headers.page
 share/help/oc/evolution/mail-refresh-folders.page
 share/help/oc/evolution/mail-save-as-pdf.page
 share/help/oc/evolution/mail-search-folders-add.page
 share/help/oc/evolution/mail-search-folders-conditions.page
-share/help/oc/evolution/mail-search-folders-enable.page
-share/help/oc/evolution/mail-search-folders-refresh.page
 share/help/oc/evolution/mail-search-folders.page
 share/help/oc/evolution/mail-searching-attachment-type.page
 share/help/oc/evolution/mail-searching.page
@@ -3930,7 +3870,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-switcher-appearance.page
 share/help/ru/evolution/contacts-add-automatically.page
 share/help/ru/evolution/contacts-autocompletion.page
 share/help/ru/evolution/contacts-google.page
@@ -3946,13 +3885,12 @@ share/help/ru/evolution/contacts-usage.page
 share/help/ru/evolution/contacts-using-contact-lists.page
 share/help/ru/evolution/contacts-using-several-addressbooks.page
 share/help/ru/evolution/credits.page
+share/help/ru/evolution/customize-ui-items.page
 share/help/ru/evolution/data-storage.page
 share/help/ru/evolution/default-browser.page
 share/help/ru/evolution/deleting-appointments.page
 share/help/ru/evolution/deleting-emails.page
 share/help/ru/evolution/deleting-to-free-disk-space.page
-share/help/ru/evolution/exchange-connectors-overview.page
-share/help/ru/evolution/exchange-placeholder.page
 share/help/ru/evolution/exporting-data-calendar.page
 share/help/ru/evolution/exporting-data-contacts.page
 share/help/ru/evolution/exporting-data-mail.page
@@ -3986,6 +3924,7 @@ share/help/ru/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -4069,7 +4008,6 @@ share/help/ru/evolution/mail-moving-emails.page
 share/help/ru/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/ru/evolution/mail-receiving-options-exchange-mapi.page
@@ -4082,13 +4020,10 @@ share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/ru/evolution/mail-receiving-options-usenet-news.page
 share/help/ru/evolution/mail-receiving-options.page
-share/help/ru/evolution/mail-recognized-thread-related-headers.page
 share/help/ru/evolution/mail-refresh-folders.page
 share/help/ru/evolution/mail-save-as-pdf.page
 share/help/ru/evolution/mail-search-folders-add.page
 share/help/ru/evolution/mail-search-folders-conditions.page
-share/help/ru/evolution/mail-search-folders-enable.page
-share/help/ru/evolution/mail-search-folders-refresh.page
 share/help/ru/evolution/mail-search-folders.page
 share/help/ru/evolution/mail-searching-attachment-type.page
 share/help/ru/evolution/mail-searching.page
@@ -4162,7 +4097,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-switcher-appearance.page
 share/help/sl/evolution/contacts-add-automatically.page
 share/help/sl/evolution/contacts-autocompletion.page
 share/help/sl/evolution/contacts-google.page
@@ -4178,13 +4112,12 @@ share/help/sl/evolution/contacts-usage.page
 share/help/sl/evolution/contacts-using-contact-lists.page
 share/help/sl/evolution/contacts-using-several-addressbooks.page
 share/help/sl/evolution/credits.page
+share/help/sl/evolution/customize-ui-items.page
 share/help/sl/evolution/data-storage.page
 share/help/sl/evolution/default-browser.page
 share/help/sl/evolution/deleting-appointments.page
 share/help/sl/evolution/deleting-emails.page
 share/help/sl/evolution/deleting-to-free-disk-space.page
-share/help/sl/evolution/exchange-connectors-overview.page
-share/help/sl/evolution/exchange-placeholder.page
 share/help/sl/evolution/exporting-data-calendar.page
 share/help/sl/evolution/exporting-data-contacts.page
 share/help/sl/evolution/exporting-data-mail.page
@@ -4218,6 +4151,7 @@ share/help/sl/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -4301,7 +4235,6 @@ share/help/sl/evolution/mail-moving-emails.page
 share/help/sl/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/sl/evolution/mail-receiving-options-exchange-mapi.page
@@ -4314,13 +4247,10 @@ share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/sl/evolution/mail-receiving-options-usenet-news.page
 share/help/sl/evolution/mail-receiving-options.page
-share/help/sl/evolution/mail-recognized-thread-related-headers.page
 share/help/sl/evolution/mail-refresh-folders.page
 share/help/sl/evolution/mail-save-as-pdf.page
 share/help/sl/evolution/mail-search-folders-add.page
 share/help/sl/evolution/mail-search-folders-conditions.page
-share/help/sl/evolution/mail-search-folders-enable.page
-share/help/sl/evolution/mail-search-folders-refresh.page
 share/help/sl/evolution/mail-search-folders.page
 share/help/sl/evolution/mail-searching-attachment-type.page
 share/help/sl/evolution/mail-searching.page
@@ -4394,7 +4324,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-switcher-appearance.page
 share/help/sv/evolution/contacts-add-automatically.page
 share/help/sv/evolution/contacts-autocompletion.page
 share/help/sv/evolution/contacts-google.page
@@ -4410,13 +4339,12 @@ share/help/sv/evolution/contacts-usage.page
 share/help/sv/evolution/contacts-using-contact-lists.page
 share/help/sv/evolution/contacts-using-several-addressbooks.page
 share/help/sv/evolution/credits.page
+share/help/sv/evolution/customize-ui-items.page
 share/help/sv/evolution/data-storage.page
 share/help/sv/evolution/default-browser.page
 share/help/sv/evolution/deleting-appointments.page
 share/help/sv/evolution/deleting-emails.page
 share/help/sv/evolution/deleting-to-free-disk-space.page
-share/help/sv/evolution/exchange-connectors-overview.page
-share/help/sv/evolution/exchange-placeholder.page
 share/help/sv/evolution/exporting-data-calendar.page
 share/help/sv/evolution/exporting-data-contacts.page
 share/help/sv/evolution/exporting-data-mail.page
@@ -4450,6 +4378,7 @@ share/help/sv/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -4533,7 +4462,6 @@ share/help/sv/evolution/mail-moving-emails.page
 share/help/sv/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/sv/evolution/mail-receiving-options-exchange-mapi.page
@@ -4546,13 +4474,10 @@ share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/sv/evolution/mail-receiving-options-usenet-news.page
 share/help/sv/evolution/mail-receiving-options.page
-share/help/sv/evolution/mail-recognized-thread-related-headers.page
 share/help/sv/evolution/mail-refresh-folders.page
 share/help/sv/evolution/mail-save-as-pdf.page
 share/help/sv/evolution/mail-search-folders-add.page
 share/help/sv/evolution/mail-search-folders-conditions.page
-share/help/sv/evolution/mail-search-folders-enable.page
-share/help/sv/evolution/mail-search-folders-refresh.page
 share/help/sv/evolution/mail-search-folders.page
 share/help/sv/evolution/mail-searching-attachment-type.page
 share/help/sv/evolution/mail-searching.page
@@ -4626,7 +4551,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-switcher-appearance.page
 share/help/te/evolution/contacts-add-automatically.page
 share/help/te/evolution/contacts-autocompletion.page
 share/help/te/evolution/contacts-google.page
@@ -4642,13 +4566,12 @@ share/help/te/evolution/contacts-usage.page
 share/help/te/evolution/contacts-using-contact-lists.page
 share/help/te/evolution/contacts-using-several-addressbooks.page
 share/help/te/evolution/credits.page
+share/help/te/evolution/customize-ui-items.page
 share/help/te/evolution/data-storage.page
 share/help/te/evolution/default-browser.page
 share/help/te/evolution/deleting-appointments.page
 share/help/te/evolution/deleting-emails.page
 share/help/te/evolution/deleting-to-free-disk-space.page
-share/help/te/evolution/exchange-connectors-overview.page
-share/help/te/evolution/exchange-placeholder.page
 share/help/te/evolution/exporting-data-calendar.page
 share/help/te/evolution/exporting-data-contacts.page
 share/help/te/evolution/exporting-data-mail.page
@@ -4682,6 +4605,7 @@ share/help/te/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -4765,7 +4689,6 @@ share/help/te/evolution/mail-moving-emails.page
 share/help/te/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/te/evolution/mail-receiving-options-exchange-mapi.page
@@ -4778,13 +4701,10 @@ share/help/te/evolution/mail-receiving-options-unix-mbox-spool-directory.page
 share/help/te/evolution/mail-receiving-options-unix-mbox-spool-file.page
 share/help/te/evolution/mail-receiving-options-usenet-news.page
 share/help/te/evolution/mail-receiving-options.page
-share/help/te/evolution/mail-recognized-thread-related-headers.page
 share/help/te/evolution/mail-refresh-folders.page
 share/help/te/evolution/mail-save-as-pdf.page
 share/help/te/evolution/mail-search-folders-add.page
 share/help/te/evolution/mail-search-folders-conditions.page
-share/help/te/evolution/mail-search-folders-enable.page
-share/help/te/evolution/mail-search-folders-refresh.page
 share/help/te/evolution/mail-search-folders.page
 share/help/te/evolution/mail-searching-attachment-type.page
 share/help/te/evolution/mail-searching.page
@@ -4858,7 +4778,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-switcher-appearance.page
 share/help/zh_CN/evolution/contacts-add-automatically.page
 share/help/zh_CN/evolution/contacts-autocompletion.page
 share/help/zh_CN/evolution/contacts-google.page
@@ -4874,13 +4793,12 @@ share/help/zh_CN/evolution/contacts-usage.page
 share/help/zh_CN/evolution/contacts-using-contact-lists.page
 share/help/zh_CN/evolution/contacts-using-several-addressbooks.page
 share/help/zh_CN/evolution/credits.page
+share/help/zh_CN/evolution/customize-ui-items.page
 share/help/zh_CN/evolution/data-storage.page
 share/help/zh_CN/evolution/default-browser.page
 share/help/zh_CN/evolution/deleting-appointments.page
 share/help/zh_CN/evolution/deleting-emails.page
 share/help/zh_CN/evolution/deleting-to-free-disk-space.page
-share/help/zh_CN/evolution/exchange-connectors-overview.page
-share/help/zh_CN/evolution/exchange-placeholder.page
 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
@@ -4914,6 +4832,7 @@ share/help/zh_CN/evolution/import-supported-file-formats.page
 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-keyboard-shortcuts.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
@@ -4997,7 +4916,6 @@ share/help/zh_CN/evolution/mail-moving-emails.page
 share/help/zh_CN/evolution/mail-not-sent.page
 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-exchange-ews.page
 share/help/zh_CN/evolution/mail-receiving-options-exchange-mapi.page
@@ -5010,13 +4928,10 @@ 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
 share/help/zh_CN/evolution/mail-receiving-options-usenet-news.page
 share/help/zh_CN/evolution/mail-receiving-options.page
-share/help/zh_CN/evolution/mail-recognized-thread-related-headers.page
 share/help/zh_CN/evolution/mail-refresh-folders.page
 share/help/zh_CN/evolution/mail-save-as-pdf.page
 share/help/zh_CN/evolution/mail-search-folders-add.page
 share/help/zh_CN/evolution/mail-search-folders-conditions.page
-share/help/zh_CN/evolution/mail-search-folders-enable.page
-share/help/zh_CN/evolution/mail-search-folders-refresh.page
 share/help/zh_CN/evolution/mail-search-folders.page
 share/help/zh_CN/evolution/mail-searching-attachment-type.page
 share/help/zh_CN/evolution/mail-searching.page
@@ -5083,96 +4998,100 @@ share/icons/hicolor/48x48/apps/evolution-memos.png
 share/icons/hicolor/48x48/apps/evolution-tasks.png
 share/icons/hicolor/48x48/apps/evolution.png
 share/icons/hicolor/symbolic/apps/evolution-symbolic.svg
-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
-share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
-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/eo/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fur/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/kk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/kn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mai/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nds/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/oc/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ps/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/si/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
-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
-share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
-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/locale/af/LC_MESSAGES/evolution.mo
+share/locale/am/LC_MESSAGES/evolution.mo
+share/locale/an/LC_MESSAGES/evolution.mo
+share/locale/ar/LC_MESSAGES/evolution.mo
+share/locale/as/LC_MESSAGES/evolution.mo
+share/locale/ast/LC_MESSAGES/evolution.mo
+share/locale/az/LC_MESSAGES/evolution.mo
+share/locale/be/LC_MESSAGES/evolution.mo
+share/locale/be@latin/LC_MESSAGES/evolution.mo
+share/locale/bg/LC_MESSAGES/evolution.mo
+share/locale/bn/LC_MESSAGES/evolution.mo
+share/locale/bn_IN/LC_MESSAGES/evolution.mo
+share/locale/br/LC_MESSAGES/evolution.mo
+share/locale/bs/LC_MESSAGES/evolution.mo
+share/locale/ca/LC_MESSAGES/evolution.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution.mo
+share/locale/cs/LC_MESSAGES/evolution.mo
+share/locale/cy/LC_MESSAGES/evolution.mo
+share/locale/da/LC_MESSAGES/evolution.mo
+share/locale/de/LC_MESSAGES/evolution.mo
+share/locale/dz/LC_MESSAGES/evolution.mo
+share/locale/el/LC_MESSAGES/evolution.mo
+share/locale/en@shaw/LC_MESSAGES/evolution.mo
+share/locale/en_AU/LC_MESSAGES/evolution.mo
+share/locale/en_CA/LC_MESSAGES/evolution.mo
+share/locale/en_GB/LC_MESSAGES/evolution.mo
+share/locale/eo/LC_MESSAGES/evolution.mo
+share/locale/es/LC_MESSAGES/evolution.mo
+share/locale/et/LC_MESSAGES/evolution.mo
+share/locale/eu/LC_MESSAGES/evolution.mo
+share/locale/fa/LC_MESSAGES/evolution.mo
+share/locale/fi/LC_MESSAGES/evolution.mo
+share/locale/fr/LC_MESSAGES/evolution.mo
+share/locale/fur/LC_MESSAGES/evolution.mo
+share/locale/ga/LC_MESSAGES/evolution.mo
+share/locale/gl/LC_MESSAGES/evolution.mo
+share/locale/gu/LC_MESSAGES/evolution.mo
+share/locale/he/LC_MESSAGES/evolution.mo
+share/locale/hi/LC_MESSAGES/evolution.mo
+share/locale/hr/LC_MESSAGES/evolution.mo
+share/locale/hu/LC_MESSAGES/evolution.mo
+share/locale/id/LC_MESSAGES/evolution.mo
+share/locale/is/LC_MESSAGES/evolution.mo
+share/locale/it/LC_MESSAGES/evolution.mo
+share/locale/ja/LC_MESSAGES/evolution.mo
+share/locale/ka/LC_MESSAGES/evolution.mo
+share/locale/kk/LC_MESSAGES/evolution.mo
+share/locale/kn/LC_MESSAGES/evolution.mo
+share/locale/ko/LC_MESSAGES/evolution.mo
+share/locale/ku/LC_MESSAGES/evolution.mo
+share/locale/lt/LC_MESSAGES/evolution.mo
+share/locale/lv/LC_MESSAGES/evolution.mo
+share/locale/mai/LC_MESSAGES/evolution.mo
+share/locale/mk/LC_MESSAGES/evolution.mo
+share/locale/ml/LC_MESSAGES/evolution.mo
+share/locale/mn/LC_MESSAGES/evolution.mo
+share/locale/mr/LC_MESSAGES/evolution.mo
+share/locale/ms/LC_MESSAGES/evolution.mo
+share/locale/nb/LC_MESSAGES/evolution.mo
+share/locale/nds/LC_MESSAGES/evolution.mo
+share/locale/ne/LC_MESSAGES/evolution.mo
+share/locale/nl/LC_MESSAGES/evolution.mo
+share/locale/nn/LC_MESSAGES/evolution.mo
+share/locale/oc/LC_MESSAGES/evolution.mo
+share/locale/or/LC_MESSAGES/evolution.mo
+share/locale/pa/LC_MESSAGES/evolution.mo
+share/locale/pl/LC_MESSAGES/evolution.mo
+share/locale/ps/LC_MESSAGES/evolution.mo
+share/locale/pt/LC_MESSAGES/evolution.mo
+share/locale/pt_BR/LC_MESSAGES/evolution.mo
+share/locale/ro/LC_MESSAGES/evolution.mo
+share/locale/ru/LC_MESSAGES/evolution.mo
+share/locale/rw/LC_MESSAGES/evolution.mo
+share/locale/si/LC_MESSAGES/evolution.mo
+share/locale/sk/LC_MESSAGES/evolution.mo
+share/locale/sl/LC_MESSAGES/evolution.mo
+share/locale/sq/LC_MESSAGES/evolution.mo
+share/locale/sr/LC_MESSAGES/evolution.mo
+share/locale/sr@latin/LC_MESSAGES/evolution.mo
+share/locale/sv/LC_MESSAGES/evolution.mo
+share/locale/ta/LC_MESSAGES/evolution.mo
+share/locale/te/LC_MESSAGES/evolution.mo
+share/locale/tg/LC_MESSAGES/evolution.mo
+share/locale/th/LC_MESSAGES/evolution.mo
+share/locale/tr/LC_MESSAGES/evolution.mo
+share/locale/ug/LC_MESSAGES/evolution.mo
+share/locale/uk/LC_MESSAGES/evolution.mo
+share/locale/vi/LC_MESSAGES/evolution.mo
+share/locale/wa/LC_MESSAGES/evolution.mo
+share/locale/xh/LC_MESSAGES/evolution.mo
+share/locale/zh_CN/LC_MESSAGES/evolution.mo
+share/locale/zh_HK/LC_MESSAGES/evolution.mo
+share/locale/zh_TW/LC_MESSAGES/evolution.mo
+%%BOGOFILTER%%share/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
+%%PST%%share/metainfo/org.gnome.Evolution-pst.metainfo.xml
+%%SPAMASSASSIN%%share/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
+share/metainfo/org.gnome.Evolution.appdata.xml
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 88820f7eed9e..99f30772534b 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,10 +1,8 @@
 # Created by: Gustau Perez <gustau.perez@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/mail/geary/Makefile 20050 2014-11-10 09:22:41Z gusi $
 
 PORTNAME=	geary
-PORTVERSION=	0.12.1
-PORTREVISION=	1
+PORTVERSION=	0.12.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/mail/geary/distinfo b/mail/geary/distinfo
index 327c48f5bc67..05cb5d59a4bb 100644
--- a/mail/geary/distinfo
+++ b/mail/geary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522699547
-SHA256 (gnome3/geary-0.12.1.tar.xz) = 065a9cd9692d6c120cd5d582aa27a05da01ec6d3af629dad1061e5214bbb0b8a
-SIZE (gnome3/geary-0.12.1.tar.xz) = 1066168
+TIMESTAMP = 1525760008
+SHA256 (gnome3/geary-0.12.2.tar.xz) = a9ef2889cf90a44462c374308eef7539193e6703c06fe6c5632e91fa097c4526
+SIZE (gnome3/geary-0.12.2.tar.xz) = 1068428
diff --git a/mail/geary/pkg-plist b/mail/geary/pkg-plist
index bc864da8fe64..9c9ffecde838 100644
--- a/mail/geary/pkg-plist
+++ b/mail/geary/pkg-plist
@@ -151,12 +151,12 @@ share/gnome/help/geary/sv/search.page
 share/gnome/help/geary/sv/shortcuts.page
 share/gnome/help/geary/sv/star.page
 share/gnome/help/geary/sv/write.page
-share/icons/hicolor/16x16/apps/geary.png
-share/icons/hicolor/24x24/apps/geary.png
-share/icons/hicolor/256x256/apps/geary.png
-share/icons/hicolor/32x32/apps/geary.png
-share/icons/hicolor/48x48/apps/geary.png
-share/icons/hicolor/512x512/apps/geary.png
+share/icons/hicolor/16x16/apps/org.gnome.Geary.png
+share/icons/hicolor/24x24/apps/org.gnome.Geary.png
+share/icons/hicolor/256x256/apps/org.gnome.Geary.png
+share/icons/hicolor/32x32/apps/org.gnome.Geary.png
+share/icons/hicolor/48x48/apps/org.gnome.Geary.png
+share/icons/hicolor/512x512/apps/org.gnome.Geary.png
 share/icons/hicolor/scalable/actions/close-symbolic.svg
 share/icons/hicolor/scalable/actions/detach-symbolic.svg
 share/icons/hicolor/scalable/actions/edit-symbolic.svg
@@ -178,7 +178,7 @@ share/icons/hicolor/scalable/actions/marker-symbolic.svg
 share/icons/hicolor/scalable/actions/tag-symbolic-rtl.svg
 share/icons/hicolor/scalable/actions/tag-symbolic.svg
 share/icons/hicolor/scalable/actions/text-x-generic-symbolic.svg
-share/icons/hicolor/symbolic/apps/geary-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg
 share/locale/ar/LC_MESSAGES/geary.mo
 share/locale/bs/LC_MESSAGES/geary.mo
 share/locale/ca/LC_MESSAGES/geary.mo
author	Koop Mast <kwm@FreeBSD.org>	2018-09-30 11:58:29 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2018-09-30 11:58:29 +0000
commit	951c1f5d1c7354f058f5919d858dbb0c174dc73e (patch)
tree	6146e775343aaf339921799078894a48fef9aa15 /mail
parent	c9b47f0427d70ba42c2d53271f8b64b8e8096825 (diff)
download	ports-951c1f5d1c7354f058f5919d858dbb0c174dc73e.tar.gz ports-951c1f5d1c7354f058f5919d858dbb0c174dc73e.zip