update to 2.22.1

This switches to the gnome-2.22 release branch.

6 files changed, 1080 insertions, 747 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 07c6c7d8b48..95fe2f8f11c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.129 2008/04/12 22:43:03 jlam Exp $
+# $NetBSD: Makefile,v 1.130 2008/04/15 18:42:53 drochner Exp $
 
-DISTNAME=		evolution-2.12.3
-PKGREVISION=		2
+DISTNAME=		evolution-2.22.1
 CATEGORIES=		mail time gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -130,12 +129,12 @@ LDFLAGS+=	-lsemaphore
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
+#.include "../../print/libgnomeprint/buildlink3.mk"
+#.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+#.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 744c579325b..9d73bb54f2f 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,504 +1,549 @@
-@comment $NetBSD: PLIST,v 1.33 2008/04/12 22:43:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.34 2008/04/15 18:42:53 drochner Exp $
 bin/evolution
-include/evolution-2.12/addressbook/gui/widgets/eab-config.h
-include/evolution-2.12/addressbook/gui/widgets/eab-menu.h
-include/evolution-2.12/addressbook/gui/widgets/eab-popup.h
-include/evolution-2.12/calendar/gui/e-cal-config.h
-include/evolution-2.12/e-conduit/e-pilot-map.h
-include/evolution-2.12/e-conduit/e-pilot-util.h
-include/evolution-2.12/e-util/e-bconf-map.h
-include/evolution-2.12/e-util/e-bit-array.h
-include/evolution-2.12/e-util/e-categories-config.h
-include/evolution-2.12/e-util/e-config-listener.h
-include/evolution-2.12/e-util/e-config.h
-include/evolution-2.12/e-util/e-corba-utils.h
-include/evolution-2.12/e-util/e-cursor.h
-include/evolution-2.12/e-util/e-dialog-utils.h
-include/evolution-2.12/e-util/e-dialog-widgets.h
-include/evolution-2.12/e-util/e-error.h
-include/evolution-2.12/e-util/e-event.h
-include/evolution-2.12/e-util/e-folder-map.h
-include/evolution-2.12/e-util/e-fsutils.h
-include/evolution-2.12/e-util/e-gui-utils.h
-include/evolution-2.12/e-util/e-html-utils.h
-include/evolution-2.12/e-util/e-icon-factory.h
-include/evolution-2.12/e-util/e-import.h
-include/evolution-2.12/e-util/e-menu.h
-include/evolution-2.12/e-util/e-mktemp.h
-include/evolution-2.12/e-util/e-plugin.h
-include/evolution-2.12/e-util/e-popup.h
-include/evolution-2.12/e-util/e-print.h
-include/evolution-2.12/e-util/e-profile-event.h
-include/evolution-2.12/e-util/e-request.h
-include/evolution-2.12/e-util/e-signature-list.h
-include/evolution-2.12/e-util/e-signature.h
-include/evolution-2.12/e-util/e-sorter-array.h
-include/evolution-2.12/e-util/e-sorter.h
-include/evolution-2.12/e-util/e-text-event-processor-emacs-like.h
-include/evolution-2.12/e-util/e-text-event-processor-types.h
-include/evolution-2.12/e-util/e-text-event-processor.h
-include/evolution-2.12/e-util/e-util-marshal.h
-include/evolution-2.12/e-util/e-util.h
-include/evolution-2.12/e-util/e-xml-utils.h
-include/evolution-2.12/mail/Evolution-Mail.h
-include/evolution-2.12/mail/em-composer-utils.h
-include/evolution-2.12/mail/em-config.h
-include/evolution-2.12/mail/em-event.h
-include/evolution-2.12/mail/em-folder-browser.h
-include/evolution-2.12/mail/em-folder-tree-model.h
-include/evolution-2.12/mail/em-folder-tree.h
-include/evolution-2.12/mail/em-folder-utils.h
-include/evolution-2.12/mail/em-folder-view.h
-include/evolution-2.12/mail/em-format-hook.h
-include/evolution-2.12/mail/em-format-html-display.h
-include/evolution-2.12/mail/em-format-html-print.h
-include/evolution-2.12/mail/em-format-html.h
-include/evolution-2.12/mail/em-format-quote.h
-include/evolution-2.12/mail/em-format.h
-include/evolution-2.12/mail/em-html-stream.h
-include/evolution-2.12/mail/em-icon-stream.h
-include/evolution-2.12/mail/em-inline-filter.h
-include/evolution-2.12/mail/em-junk-hook.h
-include/evolution-2.12/mail/em-menu.h
-include/evolution-2.12/mail/em-message-browser.h
-include/evolution-2.12/mail/em-popup.h
-include/evolution-2.12/mail/em-stripsig-filter.h
-include/evolution-2.12/mail/em-sync-stream.h
-include/evolution-2.12/mail/em-utils.h
-include/evolution-2.12/mail/em-vfs-stream.h
-include/evolution-2.12/mail/mail-autofilter.h
-include/evolution-2.12/mail/mail-component.h
-include/evolution-2.12/mail/mail-config.h
-include/evolution-2.12/mail/mail-mt.h
-include/evolution-2.12/mail/mail-ops.h
-include/evolution-2.12/mail/mail-session.h
-include/evolution-2.12/mail/mail-tools.h
-include/evolution-2.12/mail/mail-vfolder.h
-include/evolution-2.12/mail/message-list.h
-include/evolution-2.12/menus/gal-define-views-dialog.h
-include/evolution-2.12/menus/gal-define-views-model.h
-include/evolution-2.12/menus/gal-view-collection.h
-include/evolution-2.12/menus/gal-view-etable.h
-include/evolution-2.12/menus/gal-view-factory-etable.h
-include/evolution-2.12/menus/gal-view-factory.h
-include/evolution-2.12/menus/gal-view-instance-save-as-dialog.h
-include/evolution-2.12/menus/gal-view-instance.h
-include/evolution-2.12/menus/gal-view-new-dialog.h
-include/evolution-2.12/menus/gal-view.h
-include/evolution-2.12/misc/e-activity-handler.h
-include/evolution-2.12/misc/e-attachment-bar.h
-include/evolution-2.12/misc/e-attachment.h
-include/evolution-2.12/misc/e-calendar-item.h
-include/evolution-2.12/misc/e-calendar.h
-include/evolution-2.12/misc/e-canvas-background.h
-include/evolution-2.12/misc/e-canvas-utils.h
-include/evolution-2.12/misc/e-canvas-vbox.h
-include/evolution-2.12/misc/e-canvas.h
-include/evolution-2.12/misc/e-cell-date-edit.h
-include/evolution-2.12/misc/e-cell-percent.h
-include/evolution-2.12/misc/e-cell-renderer-combo.h
-include/evolution-2.12/misc/e-charset-picker.h
-include/evolution-2.12/misc/e-colors.h
-include/evolution-2.12/misc/e-combo-button.h
-include/evolution-2.12/misc/e-combo-cell-editable.h
-include/evolution-2.12/misc/e-config-page.h
-include/evolution-2.12/misc/e-cursors.h
-include/evolution-2.12/misc/e-dateedit.h
-include/evolution-2.12/misc/e-dropdown-button.h
-include/evolution-2.12/misc/e-expander.h
-include/evolution-2.12/misc/e-gui-utils.h
-include/evolution-2.12/misc/e-hsv-utils.h
-include/evolution-2.12/misc/e-icon-entry.h
-include/evolution-2.12/misc/e-image-chooser.h
-include/evolution-2.12/misc/e-info-label.h
-include/evolution-2.12/misc/e-map.h
-include/evolution-2.12/misc/e-multi-config-dialog.h
-include/evolution-2.12/misc/e-popup-menu.h
-include/evolution-2.12/misc/e-printable.h
-include/evolution-2.12/misc/e-reflow-model.h
-include/evolution-2.12/misc/e-reflow.h
-include/evolution-2.12/misc/e-search-bar.h
-include/evolution-2.12/misc/e-selection-model-array.h
-include/evolution-2.12/misc/e-selection-model-simple.h
-include/evolution-2.12/misc/e-selection-model.h
-include/evolution-2.12/misc/e-send-options.h
-include/evolution-2.12/misc/e-spinner.c
-include/evolution-2.12/misc/e-spinner.h
-include/evolution-2.12/misc/e-task-bar.h
-include/evolution-2.12/misc/e-task-widget.h
-include/evolution-2.12/misc/e-unicode.h
-include/evolution-2.12/misc/e-url-entry.h
-include/evolution-2.12/shell/Evolution.h
-include/evolution-2.12/shell/e-component-view.h
-include/evolution-2.12/shell/e-shell-utils.h
-include/evolution-2.12/shell/e-user-creatable-items-handler.h
-include/evolution-2.12/shell/es-event.h
-include/evolution-2.12/shell/es-menu.h
-include/evolution-2.12/shell/evolution-component.h
-include/evolution-2.12/shell/evolution-config-control.h
-include/evolution-2.12/shell/evolution-listener.h
-include/evolution-2.12/shell/evolution-shell-component-utils.h
-include/evolution-2.12/table/e-cell-checkbox.h
-include/evolution-2.12/table/e-cell-combo.h
-include/evolution-2.12/table/e-cell-date.h
-include/evolution-2.12/table/e-cell-float.h
-include/evolution-2.12/table/e-cell-hbox.h
-include/evolution-2.12/table/e-cell-number.h
-include/evolution-2.12/table/e-cell-pixbuf.h
-include/evolution-2.12/table/e-cell-popup.h
-include/evolution-2.12/table/e-cell-progress.h
-include/evolution-2.12/table/e-cell-size.h
-include/evolution-2.12/table/e-cell-spin-button.h
-include/evolution-2.12/table/e-cell-text.h
-include/evolution-2.12/table/e-cell-toggle.h
-include/evolution-2.12/table/e-cell-tree.h
-include/evolution-2.12/table/e-cell-vbox.h
-include/evolution-2.12/table/e-cell.h
-include/evolution-2.12/table/e-table-click-to-add.h
-include/evolution-2.12/table/e-table-col-dnd.h
-include/evolution-2.12/table/e-table-col.h
-include/evolution-2.12/table/e-table-column-specification.h
-include/evolution-2.12/table/e-table-config.h
-include/evolution-2.12/table/e-table-defines.h
-include/evolution-2.12/table/e-table-extras.h
-include/evolution-2.12/table/e-table-field-chooser-dialog.h
-include/evolution-2.12/table/e-table-field-chooser-item.h
-include/evolution-2.12/table/e-table-field-chooser.h
-include/evolution-2.12/table/e-table-group-container.h
-include/evolution-2.12/table/e-table-group-leaf.h
-include/evolution-2.12/table/e-table-group.h
-include/evolution-2.12/table/e-table-header-item.h
-include/evolution-2.12/table/e-table-header-utils.h
-include/evolution-2.12/table/e-table-header.h
-include/evolution-2.12/table/e-table-item.h
-include/evolution-2.12/table/e-table-memory-callbacks.h
-include/evolution-2.12/table/e-table-memory-store.h
-include/evolution-2.12/table/e-table-memory.h
-include/evolution-2.12/table/e-table-model.h
-include/evolution-2.12/table/e-table-one.h
-include/evolution-2.12/table/e-table-scrolled.h
-include/evolution-2.12/table/e-table-search.h
-include/evolution-2.12/table/e-table-selection-model.h
-include/evolution-2.12/table/e-table-simple.h
-include/evolution-2.12/table/e-table-sort-info.h
-include/evolution-2.12/table/e-table-sorted-variable.h
-include/evolution-2.12/table/e-table-sorted.h
-include/evolution-2.12/table/e-table-sorter.h
-include/evolution-2.12/table/e-table-sorting-utils.h
-include/evolution-2.12/table/e-table-specification.h
-include/evolution-2.12/table/e-table-state.h
-include/evolution-2.12/table/e-table-subset-variable.h
-include/evolution-2.12/table/e-table-subset.h
-include/evolution-2.12/table/e-table-tooltip.h
-include/evolution-2.12/table/e-table-utils.h
-include/evolution-2.12/table/e-table-without.h
-include/evolution-2.12/table/e-table.h
-include/evolution-2.12/table/e-tree-memory-callbacks.h
-include/evolution-2.12/table/e-tree-memory.h
-include/evolution-2.12/table/e-tree-model.h
-include/evolution-2.12/table/e-tree-scrolled.h
-include/evolution-2.12/table/e-tree-selection-model.h
-include/evolution-2.12/table/e-tree-sorted.h
-include/evolution-2.12/table/e-tree-table-adapter.h
-include/evolution-2.12/table/e-tree.h
-include/evolution-2.12/text/e-completion-callbacks.h
-include/evolution-2.12/text/e-completion-match.h
-include/evolution-2.12/text/e-completion-view.h
-include/evolution-2.12/text/e-completion.h
-include/evolution-2.12/text/e-entry.h
-include/evolution-2.12/text/e-table-text-model.h
-include/evolution-2.12/text/e-text-model-repos.h
-include/evolution-2.12/text/e-text-model-uri.h
-include/evolution-2.12/text/e-text-model.h
-include/evolution-2.12/text/e-text.h
+include/evolution-2.22/addressbook/gui/widgets/eab-config.h
+include/evolution-2.22/addressbook/gui/widgets/eab-menu.h
+include/evolution-2.22/addressbook/gui/widgets/eab-popup.h
+include/evolution-2.22/calendar/gui/e-cal-config.h
+include/evolution-2.22/e-conduit/e-pilot-map.h
+include/evolution-2.22/e-conduit/e-pilot-util.h
+include/evolution-2.22/e-util/e-bconf-map.h
+include/evolution-2.22/e-util/e-bit-array.h
+include/evolution-2.22/e-util/e-categories-config.h
+include/evolution-2.22/e-util/e-config-listener.h
+include/evolution-2.22/e-util/e-config.h
+include/evolution-2.22/e-util/e-corba-utils.h
+include/evolution-2.22/e-util/e-cursor.h
+include/evolution-2.22/e-util/e-dialog-utils.h
+include/evolution-2.22/e-util/e-dialog-widgets.h
+include/evolution-2.22/e-util/e-error.h
+include/evolution-2.22/e-util/e-event.h
+include/evolution-2.22/e-util/e-folder-map.h
+include/evolution-2.22/e-util/e-fsutils.h
+include/evolution-2.22/e-util/e-gui-utils.h
+include/evolution-2.22/e-util/e-html-utils.h
+include/evolution-2.22/e-util/e-icon-factory.h
+include/evolution-2.22/e-util/e-import.h
+include/evolution-2.22/e-util/e-logger.h
+include/evolution-2.22/e-util/e-menu.h
+include/evolution-2.22/e-util/e-mktemp.h
+include/evolution-2.22/e-util/e-plugin.h
+include/evolution-2.22/e-util/e-popup.h
+include/evolution-2.22/e-util/e-print.h
+include/evolution-2.22/e-util/e-profile-event.h
+include/evolution-2.22/e-util/e-request.h
+include/evolution-2.22/e-util/e-signature-list.h
+include/evolution-2.22/e-util/e-signature.h
+include/evolution-2.22/e-util/e-sorter-array.h
+include/evolution-2.22/e-util/e-sorter.h
+include/evolution-2.22/e-util/e-text-event-processor-emacs-like.h
+include/evolution-2.22/e-util/e-text-event-processor-types.h
+include/evolution-2.22/e-util/e-text-event-processor.h
+include/evolution-2.22/e-util/e-util-labels.h
+include/evolution-2.22/e-util/e-util-marshal.h
+include/evolution-2.22/e-util/e-util.h
+include/evolution-2.22/e-util/e-xml-utils.h
+include/evolution-2.22/mail/Evolution-Mail.h
+include/evolution-2.22/mail/em-composer-utils.h
+include/evolution-2.22/mail/em-config.h
+include/evolution-2.22/mail/em-event.h
+include/evolution-2.22/mail/em-folder-browser.h
+include/evolution-2.22/mail/em-folder-tree-model.h
+include/evolution-2.22/mail/em-folder-tree.h
+include/evolution-2.22/mail/em-folder-utils.h
+include/evolution-2.22/mail/em-folder-view.h
+include/evolution-2.22/mail/em-format-hook.h
+include/evolution-2.22/mail/em-format-html-display.h
+include/evolution-2.22/mail/em-format-html-print.h
+include/evolution-2.22/mail/em-format-html.h
+include/evolution-2.22/mail/em-format-quote.h
+include/evolution-2.22/mail/em-format.h
+include/evolution-2.22/mail/em-html-stream.h
+include/evolution-2.22/mail/em-icon-stream.h
+include/evolution-2.22/mail/em-inline-filter.h
+include/evolution-2.22/mail/em-junk-hook.h
+include/evolution-2.22/mail/em-menu.h
+include/evolution-2.22/mail/em-message-browser.h
+include/evolution-2.22/mail/em-popup.h
+include/evolution-2.22/mail/em-stripsig-filter.h
+include/evolution-2.22/mail/em-sync-stream.h
+include/evolution-2.22/mail/em-utils.h
+include/evolution-2.22/mail/em-vfs-stream.h
+include/evolution-2.22/mail/mail-autofilter.h
+include/evolution-2.22/mail/mail-component.h
+include/evolution-2.22/mail/mail-config.h
+include/evolution-2.22/mail/mail-mt.h
+include/evolution-2.22/mail/mail-ops.h
+include/evolution-2.22/mail/mail-session.h
+include/evolution-2.22/mail/mail-tools.h
+include/evolution-2.22/mail/mail-vfolder.h
+include/evolution-2.22/mail/message-list.h
+include/evolution-2.22/menus/gal-define-views-dialog.h
+include/evolution-2.22/menus/gal-define-views-model.h
+include/evolution-2.22/menus/gal-view-collection.h
+include/evolution-2.22/menus/gal-view-etable.h
+include/evolution-2.22/menus/gal-view-factory-etable.h
+include/evolution-2.22/menus/gal-view-factory.h
+include/evolution-2.22/menus/gal-view-instance-save-as-dialog.h
+include/evolution-2.22/menus/gal-view-instance.h
+include/evolution-2.22/menus/gal-view-new-dialog.h
+include/evolution-2.22/menus/gal-view.h
+include/evolution-2.22/misc/e-account-combo-box.h
+include/evolution-2.22/misc/e-activity-handler.h
+include/evolution-2.22/misc/e-attachment-bar.h
+include/evolution-2.22/misc/e-attachment.h
+include/evolution-2.22/misc/e-calendar-item.h
+include/evolution-2.22/misc/e-calendar.h
+include/evolution-2.22/misc/e-canvas-background.h
+include/evolution-2.22/misc/e-canvas-utils.h
+include/evolution-2.22/misc/e-canvas-vbox.h
+include/evolution-2.22/misc/e-canvas.h
+include/evolution-2.22/misc/e-cell-date-edit.h
+include/evolution-2.22/misc/e-cell-percent.h
+include/evolution-2.22/misc/e-cell-renderer-combo.h
+include/evolution-2.22/misc/e-charset-picker.h
+include/evolution-2.22/misc/e-colors.h
+include/evolution-2.22/misc/e-combo-button.h
+include/evolution-2.22/misc/e-combo-cell-editable.h
+include/evolution-2.22/misc/e-config-page.h
+include/evolution-2.22/misc/e-cursors.h
+include/evolution-2.22/misc/e-dateedit.h
+include/evolution-2.22/misc/e-dropdown-button.h
+include/evolution-2.22/misc/e-expander.h
+include/evolution-2.22/misc/e-gui-utils.h
+include/evolution-2.22/misc/e-hsv-utils.h
+include/evolution-2.22/misc/e-icon-entry.h
+include/evolution-2.22/misc/e-image-chooser.h
+include/evolution-2.22/misc/e-info-label.h
+include/evolution-2.22/misc/e-map.h
+include/evolution-2.22/misc/e-multi-config-dialog.h
+include/evolution-2.22/misc/e-popup-menu.h
+include/evolution-2.22/misc/e-printable.h
+include/evolution-2.22/misc/e-reflow-model.h
+include/evolution-2.22/misc/e-reflow.h
+include/evolution-2.22/misc/e-search-bar.h
+include/evolution-2.22/misc/e-selection-model-array.h
+include/evolution-2.22/misc/e-selection-model-simple.h
+include/evolution-2.22/misc/e-selection-model.h
+include/evolution-2.22/misc/e-send-options.h
+include/evolution-2.22/misc/e-signature-combo-box.h
+include/evolution-2.22/misc/e-spinner.c
+include/evolution-2.22/misc/e-spinner.h
+include/evolution-2.22/misc/e-task-bar.h
+include/evolution-2.22/misc/e-task-widget.h
+include/evolution-2.22/misc/e-unicode.h
+include/evolution-2.22/misc/e-url-entry.h
+include/evolution-2.22/shell/Evolution.h
+include/evolution-2.22/shell/e-component-view.h
+include/evolution-2.22/shell/e-shell-utils.h
+include/evolution-2.22/shell/e-user-creatable-items-handler.h
+include/evolution-2.22/shell/es-event.h
+include/evolution-2.22/shell/es-menu.h
+include/evolution-2.22/shell/evolution-component.h
+include/evolution-2.22/shell/evolution-config-control.h
+include/evolution-2.22/shell/evolution-listener.h
+include/evolution-2.22/shell/evolution-shell-component-utils.h
+include/evolution-2.22/table/e-cell-checkbox.h
+include/evolution-2.22/table/e-cell-combo.h
+include/evolution-2.22/table/e-cell-date.h
+include/evolution-2.22/table/e-cell-float.h
+include/evolution-2.22/table/e-cell-hbox.h
+include/evolution-2.22/table/e-cell-number.h
+include/evolution-2.22/table/e-cell-pixbuf.h
+include/evolution-2.22/table/e-cell-popup.h
+include/evolution-2.22/table/e-cell-progress.h
+include/evolution-2.22/table/e-cell-size.h
+include/evolution-2.22/table/e-cell-spin-button.h
+include/evolution-2.22/table/e-cell-text.h
+include/evolution-2.22/table/e-cell-toggle.h
+include/evolution-2.22/table/e-cell-tree.h
+include/evolution-2.22/table/e-cell-vbox.h
+include/evolution-2.22/table/e-cell.h
+include/evolution-2.22/table/e-table-click-to-add.h
+include/evolution-2.22/table/e-table-col-dnd.h
+include/evolution-2.22/table/e-table-col.h
+include/evolution-2.22/table/e-table-column-specification.h
+include/evolution-2.22/table/e-table-config.h
+include/evolution-2.22/table/e-table-defines.h
+include/evolution-2.22/table/e-table-extras.h
+include/evolution-2.22/table/e-table-field-chooser-dialog.h
+include/evolution-2.22/table/e-table-field-chooser-item.h
+include/evolution-2.22/table/e-table-field-chooser.h
+include/evolution-2.22/table/e-table-group-container.h
+include/evolution-2.22/table/e-table-group-leaf.h
+include/evolution-2.22/table/e-table-group.h
+include/evolution-2.22/table/e-table-header-item.h
+include/evolution-2.22/table/e-table-header-utils.h
+include/evolution-2.22/table/e-table-header.h
+include/evolution-2.22/table/e-table-item.h
+include/evolution-2.22/table/e-table-memory-callbacks.h
+include/evolution-2.22/table/e-table-memory-store.h
+include/evolution-2.22/table/e-table-memory.h
+include/evolution-2.22/table/e-table-model.h
+include/evolution-2.22/table/e-table-one.h
+include/evolution-2.22/table/e-table-scrolled.h
+include/evolution-2.22/table/e-table-search.h
+include/evolution-2.22/table/e-table-selection-model.h
+include/evolution-2.22/table/e-table-simple.h
+include/evolution-2.22/table/e-table-sort-info.h
+include/evolution-2.22/table/e-table-sorted-variable.h
+include/evolution-2.22/table/e-table-sorted.h
+include/evolution-2.22/table/e-table-sorter.h
+include/evolution-2.22/table/e-table-sorting-utils.h
+include/evolution-2.22/table/e-table-specification.h
+include/evolution-2.22/table/e-table-state.h
+include/evolution-2.22/table/e-table-subset-variable.h
+include/evolution-2.22/table/e-table-subset.h
+include/evolution-2.22/table/e-table-tooltip.h
+include/evolution-2.22/table/e-table-utils.h
+include/evolution-2.22/table/e-table-without.h
+include/evolution-2.22/table/e-table.h
+include/evolution-2.22/table/e-tree-memory-callbacks.h
+include/evolution-2.22/table/e-tree-memory.h
+include/evolution-2.22/table/e-tree-model.h
+include/evolution-2.22/table/e-tree-scrolled.h
+include/evolution-2.22/table/e-tree-selection-model.h
+include/evolution-2.22/table/e-tree-sorted.h
+include/evolution-2.22/table/e-tree-table-adapter.h
+include/evolution-2.22/table/e-tree.h
+include/evolution-2.22/text/e-text-model-repos.h
+include/evolution-2.22/text/e-text-model.h
+include/evolution-2.22/text/e-text.h
 lib/bonobo/servers/GNOME_Evolution_Addressbook.server
 lib/bonobo/servers/GNOME_Evolution_Calendar.server
 lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
 lib/bonobo/servers/GNOME_Evolution_Mail.server
 lib/bonobo/servers/GNOME_Evolution_Shell.server
-lib/evolution/2.12/components/libevolution-addressbook.la
-lib/evolution/2.12/components/libevolution-calendar.la
-lib/evolution/2.12/components/libevolution-mail.la
-lib/evolution/2.12/libeabutil.la
-lib/evolution/2.12/libeconduit.la
-lib/evolution/2.12/libecontacteditor.la
-lib/evolution/2.12/libecontactlisteditor.la
-lib/evolution/2.12/libefilterbar.la
-lib/evolution/2.12/libemiscwidgets.la
-lib/evolution/2.12/libeshell.la
-${PLIST.smime}lib/evolution/2.12/libessmime.la
-lib/evolution/2.12/libetable.la
-lib/evolution/2.12/libetext.la
-lib/evolution/2.12/libetimezonedialog.la
-lib/evolution/2.12/libeutil.la
-lib/evolution/2.12/libevolution-a11y.la
-lib/evolution/2.12/libevolution-addressbook-a11y.la
-lib/evolution/2.12/libevolution-addressbook-importers.la
-lib/evolution/2.12/libevolution-calendar-a11y.la
-lib/evolution/2.12/libevolution-calendar-importers.la
-lib/evolution/2.12/libevolution-mail-importers.la
-${PLIST.smime}lib/evolution/2.12/libevolution-smime.la
-lib/evolution/2.12/libevolution-widgets-a11y.la
-lib/evolution/2.12/libfilter.la
-lib/evolution/2.12/libmenus.la
-lib/evolution/2.12/plugins/attachment-reminder.glade
-lib/evolution/2.12/plugins/libmail-account-disable.la
-lib/evolution/2.12/plugins/liborg-gnome-addressbook-file.la
-lib/evolution/2.12/plugins/liborg-gnome-backup-restore.la
-lib/evolution/2.12/plugins/liborg-gnome-bogo-junk-plugin.la
-lib/evolution/2.12/plugins/liborg-gnome-calendar-file.la
-lib/evolution/2.12/plugins/liborg-gnome-calendar-http.la
-lib/evolution/2.12/plugins/liborg-gnome-calendar-weather.la
-lib/evolution/2.12/plugins/liborg-gnome-copy-tool.la
-lib/evolution/2.12/plugins/liborg-gnome-default-mailer.la
-lib/evolution/2.12/plugins/liborg-gnome-default-source.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-attachment-reminder.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-bbdb.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-caldav.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-hula-account-setup.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
-lib/evolution/2.12/plugins/liborg-gnome-evolution-startup-wizard.la
-lib/evolution/2.12/plugins/liborg-gnome-exchange-operations.la
-lib/evolution/2.12/plugins/liborg-gnome-face.la
-lib/evolution/2.12/plugins/liborg-gnome-groupwise-features.la
-lib/evolution/2.12/plugins/liborg-gnome-gw-account-setup.la
-lib/evolution/2.12/plugins/liborg-gnome-imap-features.la
-lib/evolution/2.12/plugins/liborg-gnome-itip-formatter.la
-lib/evolution/2.12/plugins/liborg-gnome-mail-notification.la
-lib/evolution/2.12/plugins/liborg-gnome-mail-to-task.la
-lib/evolution/2.12/plugins/liborg-gnome-mailing-list-actions.la
-lib/evolution/2.12/plugins/liborg-gnome-mark-all-read.la
-lib/evolution/2.12/plugins/liborg-gnome-mark-calendar-offline.la
-lib/evolution/2.12/plugins/liborg-gnome-new-mail-notify.la
-lib/evolution/2.12/plugins/liborg-gnome-plugin-manager.la
-lib/evolution/2.12/plugins/liborg-gnome-prefer-plain.la
-lib/evolution/2.12/plugins/liborg-gnome-print-message.la
-lib/evolution/2.12/plugins/liborg-gnome-publish-calendar.la
-lib/evolution/2.12/plugins/liborg-gnome-sa-junk-plugin.la
-lib/evolution/2.12/plugins/liborg-gnome-save-calendar.la
-lib/evolution/2.12/plugins/liborg-gnome-select-one-source.la
-lib/evolution/2.12/plugins/liborg-gnome-subject-thread.la
-lib/evolution/2.12/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/2.12/plugins/org-gnome-backup-restore.eplug
-lib/evolution/2.12/plugins/org-gnome-backup-restore.xml
-lib/evolution/2.12/plugins/org-gnome-bogo-junk-plugin.eplug
-lib/evolution/2.12/plugins/org-gnome-calendar-file.eplug
-lib/evolution/2.12/plugins/org-gnome-calendar-http.eplug
-lib/evolution/2.12/plugins/org-gnome-calendar-weather.eplug
-lib/evolution/2.12/plugins/org-gnome-compose-send-options.xml
-lib/evolution/2.12/plugins/org-gnome-copy-tool.eplug
-lib/evolution/2.12/plugins/org-gnome-default-mailer.eplug
-lib/evolution/2.12/plugins/org-gnome-default-source.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-attachment-reminder.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-bbdb.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-caldav.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-hula-account-setup.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
-lib/evolution/2.12/plugins/org-gnome-evolution-startup-wizard.eplug
-lib/evolution/2.12/plugins/org-gnome-exchange-ab-subscription.xml
-lib/evolution/2.12/plugins/org-gnome-exchange-cal-subscription.xml
-lib/evolution/2.12/plugins/org-gnome-exchange-operations.eplug
-lib/evolution/2.12/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/2.12/plugins/org-gnome-face-ui.xml
-lib/evolution/2.12/plugins/org-gnome-face.eplug
-lib/evolution/2.12/plugins/org-gnome-folder-permissions.xml
-lib/evolution/2.12/plugins/org-gnome-folder-subscription.xml
-lib/evolution/2.12/plugins/org-gnome-groupwise-features.eplug
-lib/evolution/2.12/plugins/org-gnome-gw-account-setup.eplug
-lib/evolution/2.12/plugins/org-gnome-imap-features.eplug
-lib/evolution/2.12/plugins/org-gnome-itip-formatter.eplug
-lib/evolution/2.12/plugins/org-gnome-mail-account-disable.eplug
-lib/evolution/2.12/plugins/org-gnome-mail-notification.eplug
-lib/evolution/2.12/plugins/org-gnome-mail-to-task.eplug
-lib/evolution/2.12/plugins/org-gnome-mail-to-task.xml
-lib/evolution/2.12/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/2.12/plugins/org-gnome-mailing-list-actions.xml
-lib/evolution/2.12/plugins/org-gnome-mark-all-read.eplug
-lib/evolution/2.12/plugins/org-gnome-mark-calendar-offline.eplug
-lib/evolution/2.12/plugins/org-gnome-new-mail-notify.eplug
-lib/evolution/2.12/plugins/org-gnome-plugin-manager.eplug
-lib/evolution/2.12/plugins/org-gnome-plugin-manager.xml
-lib/evolution/2.12/plugins/org-gnome-prefer-plain.eplug
-lib/evolution/2.12/plugins/org-gnome-print-message.eplug
-lib/evolution/2.12/plugins/org-gnome-print-message.xml
-lib/evolution/2.12/plugins/org-gnome-publish-calendar.eplug
-lib/evolution/2.12/plugins/org-gnome-publish-calendar.xml
-lib/evolution/2.12/plugins/org-gnome-sa-junk-plugin.eplug
-lib/evolution/2.12/plugins/org-gnome-save-calendar.eplug
-lib/evolution/2.12/plugins/org-gnome-select-one-source.eplug
-lib/evolution/2.12/plugins/org-gnome-subject-thread.eplug
+lib/evolution/2.22/components/libevolution-addressbook.la
+lib/evolution/2.22/components/libevolution-calendar.la
+lib/evolution/2.22/components/libevolution-mail.la
+lib/evolution/2.22/libeabutil.la
+lib/evolution/2.22/libeconduit.la
+lib/evolution/2.22/libecontacteditor.la
+lib/evolution/2.22/libecontactlisteditor.la
+lib/evolution/2.22/libefilterbar.la
+lib/evolution/2.22/libemiscwidgets.la
+lib/evolution/2.22/libeshell.la
+${PLIST.smime}lib/evolution/2.22/libessmime.la
+lib/evolution/2.22/libetable.la
+lib/evolution/2.22/libetext.la
+lib/evolution/2.22/libetimezonedialog.la
+lib/evolution/2.22/libeutil.la
+lib/evolution/2.22/libevolution-a11y.la
+lib/evolution/2.22/libevolution-addressbook-a11y.la
+lib/evolution/2.22/libevolution-addressbook-importers.la
+lib/evolution/2.22/libevolution-calendar-a11y.la
+lib/evolution/2.22/libevolution-calendar-importers.la
+lib/evolution/2.22/libevolution-mail-importers.la
+${PLIST.smime}lib/evolution/2.22/libevolution-smime.la
+lib/evolution/2.22/libevolution-widgets-a11y.la
+lib/evolution/2.22/libfilter.la
+lib/evolution/2.22/libmenus.la
+lib/evolution/2.22/plugins/attachment-reminder.glade
+lib/evolution/2.22/plugins/libmail-account-disable.la
+lib/evolution/2.22/plugins/liborg-gnome-addressbook-file.la
+lib/evolution/2.22/plugins/liborg-gnome-backup-restore.la
+lib/evolution/2.22/plugins/liborg-gnome-bogo-junk-plugin.la
+lib/evolution/2.22/plugins/liborg-gnome-calendar-file.la
+lib/evolution/2.22/plugins/liborg-gnome-calendar-http.la
+lib/evolution/2.22/plugins/liborg-gnome-calendar-weather.la
+lib/evolution/2.22/plugins/liborg-gnome-copy-tool.la
+lib/evolution/2.22/plugins/liborg-gnome-default-mailer.la
+lib/evolution/2.22/plugins/liborg-gnome-default-source.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-attachment-reminder.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-bbdb.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-caldav.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-google.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-hula-account-setup.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
+lib/evolution/2.22/plugins/liborg-gnome-evolution-startup-wizard.la
+lib/evolution/2.22/plugins/liborg-gnome-exchange-operations.la
+lib/evolution/2.22/plugins/liborg-gnome-face.la
+lib/evolution/2.22/plugins/liborg-gnome-groupwise-features.la
+lib/evolution/2.22/plugins/liborg-gnome-gw-account-setup.la
+lib/evolution/2.22/plugins/liborg-gnome-imap-features.la
+lib/evolution/2.22/plugins/liborg-gnome-itip-formatter.la
+lib/evolution/2.22/plugins/liborg-gnome-mail-notification.la
+lib/evolution/2.22/plugins/liborg-gnome-mail-to-task.la
+lib/evolution/2.22/plugins/liborg-gnome-mailing-list-actions.la
+lib/evolution/2.22/plugins/liborg-gnome-mark-all-read.la
+lib/evolution/2.22/plugins/liborg-gnome-mark-calendar-offline.la
+lib/evolution/2.22/plugins/liborg-gnome-plugin-manager.la
+lib/evolution/2.22/plugins/liborg-gnome-prefer-plain.la
+lib/evolution/2.22/plugins/liborg-gnome-print-message.la
+lib/evolution/2.22/plugins/liborg-gnome-publish-calendar.la
+lib/evolution/2.22/plugins/liborg-gnome-sa-junk-plugin.la
+lib/evolution/2.22/plugins/liborg-gnome-save-calendar.la
+lib/evolution/2.22/plugins/liborg-gnome-select-one-source.la
+lib/evolution/2.22/plugins/liborg-gnome-subject-thread.la
+lib/evolution/2.22/plugins/org-gnome-addressbook-file.eplug
+lib/evolution/2.22/plugins/org-gnome-backup-restore.eplug
+lib/evolution/2.22/plugins/org-gnome-backup-restore.xml
+lib/evolution/2.22/plugins/org-gnome-bogo-junk-plugin.eplug
+lib/evolution/2.22/plugins/org-gnome-calendar-file.eplug
+lib/evolution/2.22/plugins/org-gnome-calendar-http.eplug
+lib/evolution/2.22/plugins/org-gnome-calendar-weather.eplug
+lib/evolution/2.22/plugins/org-gnome-compose-send-options.xml
+lib/evolution/2.22/plugins/org-gnome-copy-tool.eplug
+lib/evolution/2.22/plugins/org-gnome-default-mailer.eplug
+lib/evolution/2.22/plugins/org-gnome-default-source.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-attachment-reminder.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-caldav.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-google.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-hula-account-setup.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
+lib/evolution/2.22/plugins/org-gnome-evolution-startup-wizard.eplug
+lib/evolution/2.22/plugins/org-gnome-exchange-ab-subscription.xml
+lib/evolution/2.22/plugins/org-gnome-exchange-cal-subscription.xml
+lib/evolution/2.22/plugins/org-gnome-exchange-operations.eplug
+lib/evolution/2.22/plugins/org-gnome-exchange-tasks-subscription.xml
+lib/evolution/2.22/plugins/org-gnome-face-ui.xml
+lib/evolution/2.22/plugins/org-gnome-face.eplug
+lib/evolution/2.22/plugins/org-gnome-folder-permissions.xml
+lib/evolution/2.22/plugins/org-gnome-folder-subscription.xml
+lib/evolution/2.22/plugins/org-gnome-groupwise-features.eplug
+lib/evolution/2.22/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/2.22/plugins/org-gnome-imap-features.eplug
+lib/evolution/2.22/plugins/org-gnome-itip-formatter.eplug
+lib/evolution/2.22/plugins/org-gnome-mail-account-disable.eplug
+lib/evolution/2.22/plugins/org-gnome-mail-notification.eplug
+lib/evolution/2.22/plugins/org-gnome-mail-to-task.eplug
+lib/evolution/2.22/plugins/org-gnome-mail-to-task.xml
+lib/evolution/2.22/plugins/org-gnome-mailing-list-actions.eplug
+lib/evolution/2.22/plugins/org-gnome-mailing-list-actions.xml
+lib/evolution/2.22/plugins/org-gnome-mark-all-read.eplug
+lib/evolution/2.22/plugins/org-gnome-mark-calendar-offline.eplug
+lib/evolution/2.22/plugins/org-gnome-plugin-manager.eplug
+lib/evolution/2.22/plugins/org-gnome-plugin-manager.xml
+lib/evolution/2.22/plugins/org-gnome-prefer-plain.eplug
+lib/evolution/2.22/plugins/org-gnome-print-message.eplug
+lib/evolution/2.22/plugins/org-gnome-print-message.xml
+lib/evolution/2.22/plugins/org-gnome-publish-calendar.eplug
+lib/evolution/2.22/plugins/org-gnome-publish-calendar.xml
+lib/evolution/2.22/plugins/org-gnome-sa-junk-plugin.eplug
+lib/evolution/2.22/plugins/org-gnome-save-calendar.eplug
+lib/evolution/2.22/plugins/org-gnome-select-one-source.eplug
+lib/evolution/2.22/plugins/org-gnome-subject-thread.eplug
 lib/pkgconfig/evolution-plugin.pc
 lib/pkgconfig/evolution-shell.pc
-libexec/evolution/2.12/csv2vcard
-libexec/evolution/2.12/evolution-addressbook-clean
-libexec/evolution/2.12/evolution-addressbook-export
-libexec/evolution/2.12/evolution-alarm-notify
-libexec/evolution/2.12/evolution-backup
-libexec/evolution/2.12/killev
+libexec/evolution/2.22/csv2vcard
+libexec/evolution/2.22/evolution-addressbook-clean
+libexec/evolution/2.22/evolution-addressbook-export
+libexec/evolution/2.22/evolution-alarm-notify
+libexec/evolution/2.22/evolution-backup
+libexec/evolution/2.22/killev
 share/applications/evolution.desktop
-share/evolution/2.12/addresstypes.xml
-share/evolution/2.12/caltypes.xml
-share/evolution/2.12/default/C/mail/local/Inbox
-share/evolution/2.12/default/de/mail/local/Inbox
-share/evolution/2.12/default/es/mail/local/Inbox
-share/evolution/2.12/default/fi/mail/local/Inbox
-share/evolution/2.12/default/fr/mail/local/Inbox
-share/evolution/2.12/default/ja/mail/local/Inbox
-share/evolution/2.12/default/lt/mail/local/Inbox
-share/evolution/2.12/default/mk/mail/local/Inbox
-share/evolution/2.12/default/nl/mail/local/Inbox
-share/evolution/2.12/default/pl/mail/local/Inbox
-share/evolution/2.12/default/pt/mail/local/Inbox
-share/evolution/2.12/default/sv/mail/local/Inbox
-share/evolution/2.12/default/zh_CN/mail/local/Inbox
-share/evolution/2.12/ecps/medbook.ecps
-share/evolution/2.12/ecps/phonelist.ecps
-share/evolution/2.12/ecps/smallbook.ecps
-share/evolution/2.12/errors/addressbook.error
-share/evolution/2.12/errors/calendar.error
-share/evolution/2.12/errors/e-system.error
-share/evolution/2.12/errors/filter.error
-share/evolution/2.12/errors/mail-composer.error
-share/evolution/2.12/errors/mail.error
-share/evolution/2.12/errors/org-gnome-attachment-reminder.error
-share/evolution/2.12/errors/org-gnome-backup-restore.error
-share/evolution/2.12/errors/org-gnome-default-mailer.error
-share/evolution/2.12/errors/org-gnome-exchange-operations.error
-share/evolution/2.12/errors/org-gnome-face.errors.xml
-share/evolution/2.12/errors/org-gnome-itip-formatter.error
-share/evolution/2.12/errors/org-gnome-mail-retract-errors.xml
-share/evolution/2.12/errors/org-gnome-mailing-list-actions.error
-share/evolution/2.12/errors/org-gnome-proxy-errors.xml
-share/evolution/2.12/errors/org-gnome-proxy-login-errors.xml
-share/evolution/2.12/errors/org-gnome-shared-folder.errors.xml
-share/evolution/2.12/errors/shell.error
-share/evolution/2.12/etspec/e-addressbook-view.etspec
-share/evolution/2.12/etspec/e-cal-list-view.etspec
-share/evolution/2.12/etspec/e-calendar-table.etspec
-share/evolution/2.12/etspec/e-contact-list-editor.etspec
-share/evolution/2.12/etspec/e-meeting-time-sel.etspec
-share/evolution/2.12/etspec/e-memo-table.etspec
-share/evolution/2.12/etspec/message-list.etspec
-share/evolution/2.12/filtertypes.xml
-share/evolution/2.12/glade/alarm-dialog.glade
-share/evolution/2.12/glade/alarm-list-dialog.glade
-share/evolution/2.12/glade/alarm-notify.glade
-share/evolution/2.12/glade/cal-prefs-dialog.glade
-share/evolution/2.12/glade/contact-editor.glade
-share/evolution/2.12/glade/contact-list-editor.glade
-share/evolution/2.12/glade/e-active-connection-dialog.glade
-share/evolution/2.12/glade/e-attachment.glade
-share/evolution/2.12/glade/e-contact-print.glade
-share/evolution/2.12/glade/e-delegate-dialog.glade
-share/evolution/2.12/glade/e-foreign-folder-dialog.glade
-share/evolution/2.12/glade/e-itip-control.glade
-share/evolution/2.12/glade/e-send-options.glade
-share/evolution/2.12/glade/e-table-config-no-group.glade
-share/evolution/2.12/glade/e-table-config.glade
-share/evolution/2.12/glade/e-table-field-chooser.glade
-share/evolution/2.12/glade/e-timezone-dialog.glade
-share/evolution/2.12/glade/eab-contact-commit-duplicate-detected.glade
-share/evolution/2.12/glade/eab-contact-duplicate-detected.glade
-share/evolution/2.12/glade/event-page.glade
-share/evolution/2.12/glade/exchange-change-password.glade
-share/evolution/2.12/glade/exchange-delegates.glade
-share/evolution/2.12/glade/exchange-folder-tree.glade
-share/evolution/2.12/glade/exchange-oof.glade
-share/evolution/2.12/glade/exchange-passwd-expiry.glade
-share/evolution/2.12/glade/exchange-permissions-dialog.glade
-share/evolution/2.12/glade/exchange-send-options.glade
-share/evolution/2.12/glade/filter.glade
-share/evolution/2.12/glade/fulladdr.glade
-share/evolution/2.12/glade/fullname.glade
-share/evolution/2.12/glade/gal-categories.glade
-share/evolution/2.12/glade/gal-define-views.glade
-share/evolution/2.12/glade/gal-view-instance-save-as-dialog.glade
-share/evolution/2.12/glade/gal-view-new-dialog.glade
-share/evolution/2.12/glade/goto-dialog.glade
-share/evolution/2.12/glade/im.glade
-share/evolution/2.12/glade/imap-headers.glade
-share/evolution/2.12/glade/import.glade
-share/evolution/2.12/glade/junk-settings.glade
-share/evolution/2.12/glade/ldap-config.glade
-share/evolution/2.12/glade/mail-config.glade
-share/evolution/2.12/glade/mail-dialogs.glade
-share/evolution/2.12/glade/meeting-page.glade
-share/evolution/2.12/glade/memo-page.glade
-share/evolution/2.12/glade/properties.glade
-share/evolution/2.12/glade/proxy-add-dialog.glade
-share/evolution/2.12/glade/proxy-listing.glade
-share/evolution/2.12/glade/proxy-login-dialog.glade
-share/evolution/2.12/glade/publish-calendar.glade
-share/evolution/2.12/glade/recurrence-page.glade
-share/evolution/2.12/glade/schedule-page.glade
-${PLIST.smime}share/evolution/2.12/glade/smime-ui.glade
-share/evolution/2.12/glade/task-details-page.glade
-share/evolution/2.12/glade/task-page.glade
-share/evolution/2.12/help/quickref/C/quickref.pdf
-share/evolution/2.12/help/quickref/de/quickref.pdf
-share/evolution/2.12/help/quickref/es/quickref.pdf
-share/evolution/2.12/help/quickref/fr/quickref.pdf
-share/evolution/2.12/help/quickref/it/quickref.pdf
-share/evolution/2.12/help/quickref/pl/quickref.pdf
-share/evolution/2.12/help/quickref/pt/quickref.pdf
-share/evolution/2.12/help/quickref/sq/quickref.pdf
-share/evolution/2.12/help/quickref/sv/quickref.pdf
-share/evolution/2.12/images/evolution-contacts-mini.png
-share/evolution/2.12/images/minus.png
-share/evolution/2.12/images/offline.png
-share/evolution/2.12/images/online.png
-share/evolution/2.12/images/plus.png
-share/evolution/2.12/images/query-free-busy.png
-share/evolution/2.12/images/world_map-960.png
-share/evolution/2.12/memotypes.xml
-share/evolution/2.12/searchtypes.xml
-share/evolution/2.12/tasktypes.xml
-share/evolution/2.12/ui/evolution-addressbook.xml
-share/evolution/2.12/ui/evolution-calendar.xml
-share/evolution/2.12/ui/evolution-composer-entries.xml
-share/evolution/2.12/ui/evolution-editor.xml
-share/evolution/2.12/ui/evolution-event-editor.xml
-share/evolution/2.12/ui/evolution-mail-global.xml
-share/evolution/2.12/ui/evolution-mail-list.xml
-share/evolution/2.12/ui/evolution-mail-message.xml
-share/evolution/2.12/ui/evolution-mail-messagedisplay.xml
-share/evolution/2.12/ui/evolution-memo-editor.xml
-share/evolution/2.12/ui/evolution-memos.xml
-share/evolution/2.12/ui/evolution-message-composer.xml
-share/evolution/2.12/ui/evolution-signature-editor.xml
-share/evolution/2.12/ui/evolution-subscribe.xml
-share/evolution/2.12/ui/evolution-task-editor.xml
-share/evolution/2.12/ui/evolution-tasks.xml
-share/evolution/2.12/ui/evolution.xml
-share/evolution/2.12/vfoldertypes.xml
-share/evolution/2.12/views/addressbook/Address_Cards.galview
-share/evolution/2.12/views/addressbook/By_Company.galview
-share/evolution/2.12/views/addressbook/Phone_List.galview
-share/evolution/2.12/views/addressbook/galview.xml
-share/evolution/2.12/views/calendar/List_View.galview
-share/evolution/2.12/views/calendar/galview.xml
-share/evolution/2.12/views/mail/As_Sent_Folder.galview
-share/evolution/2.12/views/mail/By_Follow_Up_Flag.galview
-share/evolution/2.12/views/mail/By_Sender.galview
-share/evolution/2.12/views/mail/By_Status.galview
-share/evolution/2.12/views/mail/By_Subject.galview
-share/evolution/2.12/views/mail/Messages.galview
-share/evolution/2.12/views/mail/Wide_View_Normal.galview
-share/evolution/2.12/views/mail/Wide_View_Sent.galview
-share/evolution/2.12/views/mail/galview.xml
-share/evolution/2.12/views/memos/Memos.galview
-share/evolution/2.12/views/memos/galview.xml
-share/evolution/2.12/views/tasks/Tasks.galview
-share/evolution/2.12/views/tasks/With_DueDate.galview
-share/evolution/2.12/views/tasks/With_Status.galview
-share/evolution/2.12/views/tasks/galview.xml
-share/evolution/2.12/weather/category_weather_cloudy_16.png
-share/evolution/2.12/weather/category_weather_fog_16.png
-share/evolution/2.12/weather/category_weather_partly_cloudy_16.png
-share/evolution/2.12/weather/category_weather_rain_16.png
-share/evolution/2.12/weather/category_weather_snow_16.png
-share/evolution/2.12/weather/category_weather_sun_16.png
-share/evolution/2.12/weather/category_weather_tstorm_16.png
+share/evolution/2.22/addresstypes.xml
+share/evolution/2.22/caltypes.xml
+share/evolution/2.22/default/C/mail/local/Inbox
+share/evolution/2.22/default/de/mail/local/Inbox
+share/evolution/2.22/default/es/mail/local/Inbox
+share/evolution/2.22/default/fi/mail/local/Inbox
+share/evolution/2.22/default/fr/mail/local/Inbox
+share/evolution/2.22/default/ja/mail/local/Inbox
+share/evolution/2.22/default/ko/mail/local/Inbox
+share/evolution/2.22/default/lt/mail/local/Inbox
+share/evolution/2.22/default/mk/mail/local/Inbox
+share/evolution/2.22/default/nl/mail/local/Inbox
+share/evolution/2.22/default/pl/mail/local/Inbox
+share/evolution/2.22/default/pt/mail/local/Inbox
+share/evolution/2.22/default/sv/mail/local/Inbox
+share/evolution/2.22/default/zh_CN/mail/local/Inbox
+share/evolution/2.22/ecps/medbook.ecps
+share/evolution/2.22/ecps/phonelist.ecps
+share/evolution/2.22/ecps/smallbook.ecps
+share/evolution/2.22/errors/addressbook.error
+share/evolution/2.22/errors/calendar.error
+share/evolution/2.22/errors/e-system.error
+share/evolution/2.22/errors/filter.error
+share/evolution/2.22/errors/mail-composer.error
+share/evolution/2.22/errors/mail.error
+share/evolution/2.22/errors/org-gnome-attachment-reminder.error
+share/evolution/2.22/errors/org-gnome-backup-restore.error
+share/evolution/2.22/errors/org-gnome-default-mailer.error
+share/evolution/2.22/errors/org-gnome-exchange-operations.error
+share/evolution/2.22/errors/org-gnome-face.errors.xml
+share/evolution/2.22/errors/org-gnome-itip-formatter.error
+share/evolution/2.22/errors/org-gnome-mail-retract-errors.xml
+share/evolution/2.22/errors/org-gnome-mailing-list-actions.error
+share/evolution/2.22/errors/org-gnome-proxy-errors.xml
+share/evolution/2.22/errors/org-gnome-proxy-login-errors.xml
+share/evolution/2.22/errors/org-gnome-shared-folder.errors.xml
+share/evolution/2.22/errors/shell.error
+share/evolution/2.22/etspec/e-addressbook-view.etspec
+share/evolution/2.22/etspec/e-cal-list-view.etspec
+share/evolution/2.22/etspec/e-calendar-table.etspec
+share/evolution/2.22/etspec/e-meeting-time-sel.etspec
+share/evolution/2.22/etspec/e-memo-table.etspec
+share/evolution/2.22/etspec/message-list.etspec
+share/evolution/2.22/filtertypes.xml
+share/evolution/2.22/glade/alarm-dialog.glade
+share/evolution/2.22/glade/alarm-list-dialog.glade
+share/evolution/2.22/glade/alarm-notify.glade
+share/evolution/2.22/glade/cal-prefs-dialog.glade
+share/evolution/2.22/glade/contact-editor.glade
+share/evolution/2.22/glade/contact-list-editor.glade
+share/evolution/2.22/glade/e-active-connection-dialog.glade
+share/evolution/2.22/glade/e-attachment.glade
+share/evolution/2.22/glade/e-contact-print.glade
+share/evolution/2.22/glade/e-delegate-dialog.glade
+share/evolution/2.22/glade/e-foreign-folder-dialog.glade
+share/evolution/2.22/glade/e-itip-control.glade
+share/evolution/2.22/glade/e-send-options.glade
+share/evolution/2.22/glade/e-table-config.glade
+share/evolution/2.22/glade/e-table-field-chooser.glade
+share/evolution/2.22/glade/e-timezone-dialog.glade
+share/evolution/2.22/glade/eab-contact-commit-duplicate-detected.glade
+share/evolution/2.22/glade/eab-contact-duplicate-detected.glade
+share/evolution/2.22/glade/event-page.glade
+share/evolution/2.22/glade/exchange-change-password.glade
+share/evolution/2.22/glade/exchange-delegates.glade
+share/evolution/2.22/glade/exchange-folder-tree.glade
+share/evolution/2.22/glade/exchange-oof.glade
+share/evolution/2.22/glade/exchange-passwd-expiry.glade
+share/evolution/2.22/glade/exchange-permissions-dialog.glade
+share/evolution/2.22/glade/exchange-send-options.glade
+share/evolution/2.22/glade/filter.glade
+share/evolution/2.22/glade/fulladdr.glade
+share/evolution/2.22/glade/fullname.glade
+share/evolution/2.22/glade/gal-categories.glade
+share/evolution/2.22/glade/gal-define-views.glade
+share/evolution/2.22/glade/gal-view-instance-save-as-dialog.glade
+share/evolution/2.22/glade/gal-view-new-dialog.glade
+share/evolution/2.22/glade/goto-dialog.glade
+share/evolution/2.22/glade/im.glade
+share/evolution/2.22/glade/imap-headers.glade
+share/evolution/2.22/glade/import.glade
+share/evolution/2.22/glade/junk-settings.glade
+share/evolution/2.22/glade/ldap-config.glade
+share/evolution/2.22/glade/mail-config.glade
+share/evolution/2.22/glade/mail-dialogs.glade
+share/evolution/2.22/glade/meeting-page.glade
+share/evolution/2.22/glade/memo-page.glade
+share/evolution/2.22/glade/properties.glade
+share/evolution/2.22/glade/proxy-add-dialog.glade
+share/evolution/2.22/glade/proxy-listing.glade
+share/evolution/2.22/glade/proxy-login-dialog.glade
+share/evolution/2.22/glade/publish-calendar.glade
+share/evolution/2.22/glade/recurrence-page.glade
+share/evolution/2.22/glade/schedule-page.glade
+${PLIST.smime}share/evolution/2.22/glade/smime-ui.glade
+share/evolution/2.22/glade/task-details-page.glade
+share/evolution/2.22/glade/task-page.glade
+share/evolution/2.22/help/quickref/C/quickref.pdf
+share/evolution/2.22/help/quickref/de/quickref.pdf
+share/evolution/2.22/help/quickref/es/quickref.pdf
+share/evolution/2.22/help/quickref/fr/quickref.pdf
+share/evolution/2.22/help/quickref/hu/quickref.pdf
+share/evolution/2.22/help/quickref/it/quickref.pdf
+share/evolution/2.22/help/quickref/pl/quickref.pdf
+share/evolution/2.22/help/quickref/pt/quickref.pdf
+share/evolution/2.22/help/quickref/sq/quickref.pdf
+share/evolution/2.22/help/quickref/sv/quickref.pdf
+share/evolution/2.22/icons/hicolor/16x16/actions/folder-copy.png
+share/evolution/2.22/icons/hicolor/16x16/actions/folder-move.png
+share/evolution/2.22/icons/hicolor/16x16/actions/go-today.png
+share/evolution/2.22/icons/hicolor/16x16/actions/mail-copy.png
+share/evolution/2.22/icons/hicolor/16x16/actions/mail-move.png
+share/evolution/2.22/icons/hicolor/16x16/actions/view-calendar-day.png
+share/evolution/2.22/icons/hicolor/16x16/actions/view-calendar-list.png
+share/evolution/2.22/icons/hicolor/16x16/actions/view-calendar-month.png
+share/evolution/2.22/icons/hicolor/16x16/actions/view-calendar-week.png
+share/evolution/2.22/icons/hicolor/16x16/actions/view-calendar-workweek.png
+share/evolution/2.22/icons/hicolor/16x16/places/mail-inbox.png
+share/evolution/2.22/icons/hicolor/16x16/places/mail-outbox.png
+share/evolution/2.22/icons/hicolor/16x16/places/mail-sent.png
+share/evolution/2.22/icons/hicolor/22x22/actions/go-today.png
+share/evolution/2.22/icons/hicolor/22x22/actions/view-calendar-day.png
+share/evolution/2.22/icons/hicolor/22x22/actions/view-calendar-list.png
+share/evolution/2.22/icons/hicolor/22x22/actions/view-calendar-month.png
+share/evolution/2.22/icons/hicolor/22x22/actions/view-calendar-week.png
+share/evolution/2.22/icons/hicolor/22x22/actions/view-calendar-workweek.png
+share/evolution/2.22/icons/hicolor/22x22/places/mail-inbox.png
+share/evolution/2.22/icons/hicolor/22x22/places/mail-outbox.png
+share/evolution/2.22/icons/hicolor/22x22/places/mail-sent.png
+share/evolution/2.22/icons/hicolor/24x24/actions/go-today.png
+share/evolution/2.22/icons/hicolor/24x24/actions/view-calendar-day.png
+share/evolution/2.22/icons/hicolor/24x24/actions/view-calendar-list.png
+share/evolution/2.22/icons/hicolor/24x24/actions/view-calendar-month.png
+share/evolution/2.22/icons/hicolor/24x24/actions/view-calendar-week.png
+share/evolution/2.22/icons/hicolor/24x24/actions/view-calendar-workweek.png
+share/evolution/2.22/icons/hicolor/24x24/places/mail-inbox.png
+share/evolution/2.22/icons/hicolor/24x24/places/mail-outbox.png
+share/evolution/2.22/icons/hicolor/24x24/places/mail-sent.png
+share/evolution/2.22/icons/hicolor/32x32/actions/view-calendar-day.png
+share/evolution/2.22/icons/hicolor/32x32/actions/view-calendar-list.png
+share/evolution/2.22/icons/hicolor/32x32/actions/view-calendar-month.png
+share/evolution/2.22/icons/hicolor/32x32/actions/view-calendar-week.png
+share/evolution/2.22/icons/hicolor/32x32/actions/view-calendar-workweek.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-autocompletion.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-calendar-and-tasks.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-certificates.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-composer.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-mail-accounts.png
+share/evolution/2.22/icons/hicolor/48x48/categories/preferences-mail.png
+share/evolution/2.22/icons/hicolor/scalable/actions/view-calendar-day.svg
+share/evolution/2.22/icons/hicolor/scalable/actions/view-calendar-list.svg
+share/evolution/2.22/icons/hicolor/scalable/actions/view-calendar-month.svg
+share/evolution/2.22/icons/hicolor/scalable/actions/view-calendar-week.svg
+share/evolution/2.22/icons/hicolor/scalable/actions/view-calendar-workweek.svg
+share/evolution/2.22/images/evolution-contacts-mini.png
+share/evolution/2.22/images/minus.png
+share/evolution/2.22/images/offline.png
+share/evolution/2.22/images/online.png
+share/evolution/2.22/images/plus.png
+share/evolution/2.22/images/query-free-busy.png
+share/evolution/2.22/images/world_map-960.png
+share/evolution/2.22/memotypes.xml
+share/evolution/2.22/searchtypes.xml
+share/evolution/2.22/sounds/default_alarm.wav
+share/evolution/2.22/tasktypes.xml
+share/evolution/2.22/ui/evolution-addressbook.xml
+share/evolution/2.22/ui/evolution-calendar.xml
+share/evolution/2.22/ui/evolution-composer-entries.xml
+share/evolution/2.22/ui/evolution-editor.xml
+share/evolution/2.22/ui/evolution-event-editor.xml
+share/evolution/2.22/ui/evolution-mail-global.xml
+share/evolution/2.22/ui/evolution-mail-list.xml
+share/evolution/2.22/ui/evolution-mail-message.xml
+share/evolution/2.22/ui/evolution-mail-messagedisplay.xml
+share/evolution/2.22/ui/evolution-memo-editor.xml
+share/evolution/2.22/ui/evolution-memos.xml
+share/evolution/2.22/ui/evolution-message-composer.xml
+share/evolution/2.22/ui/evolution-signature-editor.xml
+share/evolution/2.22/ui/evolution-subscribe.xml
+share/evolution/2.22/ui/evolution-task-editor.xml
+share/evolution/2.22/ui/evolution-tasks.xml
+share/evolution/2.22/ui/evolution.xml
+share/evolution/2.22/vfoldertypes.xml
+share/evolution/2.22/views/addressbook/Address_Cards.galview
+share/evolution/2.22/views/addressbook/By_Company.galview
+share/evolution/2.22/views/addressbook/Phone_List.galview
+share/evolution/2.22/views/addressbook/galview.xml
+share/evolution/2.22/views/calendar/List_View.galview
+share/evolution/2.22/views/calendar/galview.xml
+share/evolution/2.22/views/mail/As_Sent_Folder.galview
+share/evolution/2.22/views/mail/By_Follow_Up_Flag.galview
+share/evolution/2.22/views/mail/By_Sender.galview
+share/evolution/2.22/views/mail/By_Status.galview
+share/evolution/2.22/views/mail/By_Subject.galview
+share/evolution/2.22/views/mail/Messages.galview
+share/evolution/2.22/views/mail/Wide_View_Normal.galview
+share/evolution/2.22/views/mail/Wide_View_Sent.galview
+share/evolution/2.22/views/mail/galview.xml
+share/evolution/2.22/views/memos/Memos.galview
+share/evolution/2.22/views/memos/galview.xml
+share/evolution/2.22/views/tasks/Tasks.galview
+share/evolution/2.22/views/tasks/With_DueDate.galview
+share/evolution/2.22/views/tasks/With_Status.galview
+share/evolution/2.22/views/tasks/galview.xml
+share/evolution/2.22/weather/category_weather_cloudy_16.png
+share/evolution/2.22/weather/category_weather_fog_16.png
+share/evolution/2.22/weather/category_weather_partly_cloudy_16.png
+share/evolution/2.22/weather/category_weather_rain_16.png
+share/evolution/2.22/weather/category_weather_snow_16.png
+share/evolution/2.22/weather/category_weather_sun_16.png
+share/evolution/2.22/weather/category_weather_tstorm_16.png
 share/gconf/schemas/apps-evolution-attachment-reminder.schemas
 share/gconf/schemas/apps-evolution-mail-notification.schemas
 share/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas
@@ -538,7 +583,12 @@ share/gnome/help/evolution/C/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/C/figures/evo_calstatus_a.png
 share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/C/figures/evo_crash_recovery.png
+share/gnome/help/evolution/C/figures/evo_custom_header.png
+share/gnome/help/evolution/C/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/C/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/C/figures/evo_dialog-info.png
+share/gnome/help/evolution/C/figures/evo_dialog-warning.png
 share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/C/figures/evo_edit_search.png
 share/gnome/help/evolution/C/figures/evo_email_a.png
@@ -553,6 +603,8 @@ share/gnome/help/evolution/C/figures/evo_imapheader_a.png
 share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/C/figures/evo_import_asst_a.png
 share/gnome/help/evolution/C/figures/evo_junk_a.png
+share/gnome/help/evolution/C/figures/evo_label_a.png
+share/gnome/help/evolution/C/figures/evo_labels_a.png
 share/gnome/help/evolution/C/figures/evo_mail_a.png
 share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/C/figures/evo_mail_notifier.png
@@ -599,6 +651,7 @@ share/gnome/help/evolution/C/figures/full-4.png
 share/gnome/help/evolution/C/figures/full-5.png
 share/gnome/help/evolution/C/figures/full-6.png
 share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/google_cal_view.png
 share/gnome/help/evolution/C/figures/mail-druid-pic.png
 share/gnome/help/evolution/C/figures/mail-inbox.png
 share/gnome/help/evolution/C/figures/mail-threaded.png
@@ -619,6 +672,126 @@ share/gnome/help/evolution/C/figures/sub-others-folder.png
 share/gnome/help/evolution/C/figures/sub-pub-fold.png
 share/gnome/help/evolution/C/figures/ver_view_a.png
 share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/cs/evolution.xml
+share/gnome/help/evolution/cs/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/cs/figures/account_editor_a.png
+share/gnome/help/evolution/cs/figures/addrs_book_a.png
+share/gnome/help/evolution/cs/figures/attach_reminder_a.png.png
+share/gnome/help/evolution/cs/figures/calendar.png
+share/gnome/help/evolution/cs/figures/categories_a.png
+share/gnome/help/evolution/cs/figures/collap_head_a.png
+share/gnome/help/evolution/cs/figures/config-cal.png
+share/gnome/help/evolution/cs/figures/config-mail.png
+share/gnome/help/evolution/cs/figures/contact-editor.png
+share/gnome/help/evolution/cs/figures/contact.png
+share/gnome/help/evolution/cs/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/cs/figures/delgt-add.png
+share/gnome/help/evolution/cs/figures/evo_account_editor_a.png
+share/gnome/help/evolution/cs/figures/evo_account_info_a.png
+share/gnome/help/evolution/cs/figures/evo_add_rule_a.png
+share/gnome/help/evolution/cs/figures/evo_adv_search_a.png
+share/gnome/help/evolution/cs/figures/evo_allday_a.png
+share/gnome/help/evolution/cs/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/cs/figures/evo_backup.png
+share/gnome/help/evolution/cs/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/cs/figures/evo_backup_warning.png
+share/gnome/help/evolution/cs/figures/evo_blink.png
+share/gnome/help/evolution/cs/figures/evo_cal_a.png
+share/gnome/help/evolution/cs/figures/evo_cal_advsearch.png
+share/gnome/help/evolution/cs/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/cs/figures/evo_cal_prop_a.png
+share/gnome/help/evolution/cs/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/cs/figures/evo_calstatus_a.png
+share/gnome/help/evolution/cs/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/cs/figures/evo_crash_recovery.png
+share/gnome/help/evolution/cs/figures/evo_custom_header.png
+share/gnome/help/evolution/cs/figures/evo_debuglogs_a.png
+share/gnome/help/evolution/cs/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/cs/figures/evo_dialog-info.png
+share/gnome/help/evolution/cs/figures/evo_dialog-warning.png
+share/gnome/help/evolution/cs/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/cs/figures/evo_edit_search.png
+share/gnome/help/evolution/cs/figures/evo_email_a.png
+share/gnome/help/evolution/cs/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/cs/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/cs/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/cs/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/cs/figures/evo_identity_a.png
+share/gnome/help/evolution/cs/figures/evo_identityedit_a.png
+share/gnome/help/evolution/cs/figures/evo_imapheader_a.png
+share/gnome/help/evolution/cs/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_import_asst_a.png
+share/gnome/help/evolution/cs/figures/evo_junk_a.png
+share/gnome/help/evolution/cs/figures/evo_label_a.png
+share/gnome/help/evolution/cs/figures/evo_labels_a.png
+share/gnome/help/evolution/cs/figures/evo_mail_a.png
+share/gnome/help/evolution/cs/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/cs/figures/evo_mail_notifier.png
+share/gnome/help/evolution/cs/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_memo_a.png
+share/gnome/help/evolution/cs/figures/evo_mereceive_a.png
+share/gnome/help/evolution/cs/figures/evo_message_filters_a.png
+share/gnome/help/evolution/cs/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_newmail.png
+share/gnome/help/evolution/cs/figures/evo_newmess_a.png
+share/gnome/help/evolution/cs/figures/evo_offline.png
+share/gnome/help/evolution/cs/figures/evo_popreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/cs/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/cs/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/cs/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/cs/figures/evo_rule_a.png
+share/gnome/help/evolution/cs/figures/evo_select_add_folder.png
+share/gnome/help/evolution/cs/figures/evo_select_folder.png
+share/gnome/help/evolution/cs/figures/evo_send_option_a.png
+share/gnome/help/evolution/cs/figures/evo_send_setup_a.png
+share/gnome/help/evolution/cs/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/cs/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/cs/figures/evo_timezone_a.png
+share/gnome/help/evolution/cs/figures/evo_usereceive_a.png
+share/gnome/help/evolution/cs/figures/exchange-delegation.png
+share/gnome/help/evolution/cs/figures/exchange-identity.png
+share/gnome/help/evolution/cs/figures/exchange-receive-options.png
+share/gnome/help/evolution/cs/figures/exchange-receive.png
+share/gnome/help/evolution/cs/figures/exchg-identity.png
+share/gnome/help/evolution/cs/figures/exchng-identity.png
+share/gnome/help/evolution/cs/figures/exchng-rec-mail.png
+share/gnome/help/evolution/cs/figures/exchng-rec-mails.png
+share/gnome/help/evolution/cs/figures/exchng-rec-option.png
+share/gnome/help/evolution/cs/figures/exchng-rec-options.png
+share/gnome/help/evolution/cs/figures/exchng-settings.png
+share/gnome/help/evolution/cs/figures/filter-new-fig.png
+share/gnome/help/evolution/cs/figures/free_busy.png
+share/gnome/help/evolution/cs/figures/full-1.png
+share/gnome/help/evolution/cs/figures/full-2.png
+share/gnome/help/evolution/cs/figures/full-3.png
+share/gnome/help/evolution/cs/figures/full-4.png
+share/gnome/help/evolution/cs/figures/full-5.png
+share/gnome/help/evolution/cs/figures/full-6.png
+share/gnome/help/evolution/cs/figures/full-7.png
+share/gnome/help/evolution/cs/figures/google_cal_view.png
+share/gnome/help/evolution/cs/figures/mail-druid-pic.png
+share/gnome/help/evolution/cs/figures/mail-inbox.png
+share/gnome/help/evolution/cs/figures/mail-threaded.png
+share/gnome/help/evolution/cs/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/cs/figures/mailer_preferences.png
+share/gnome/help/evolution/cs/figures/mainwindow-pic.png
+share/gnome/help/evolution/cs/figures/minus.png
+share/gnome/help/evolution/cs/figures/newmsg.png
+share/gnome/help/evolution/cs/figures/plus.png
+share/gnome/help/evolution/cs/figures/proxy-cal.png
+share/gnome/help/evolution/cs/figures/proxy-login.png
+share/gnome/help/evolution/cs/figures/quick_add_a.png
+share/gnome/help/evolution/cs/figures/quick_reference.png
+share/gnome/help/evolution/cs/figures/replymsg.png
+share/gnome/help/evolution/cs/figures/schedule.png
+share/gnome/help/evolution/cs/figures/stock_search.png
+share/gnome/help/evolution/cs/figures/sub-others-folder.png
+share/gnome/help/evolution/cs/figures/sub-pub-fold.png
+share/gnome/help/evolution/cs/figures/ver_view_a.png
+share/gnome/help/evolution/cs/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/de/evolution.xml
 share/gnome/help/evolution/de/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/de/figures/account_editor_a.png
@@ -650,7 +823,12 @@ share/gnome/help/evolution/de/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/de/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/de/figures/evo_calstatus_a.png
 share/gnome/help/evolution/de/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/de/figures/evo_crash_recovery.png
+share/gnome/help/evolution/de/figures/evo_custom_header.png
+share/gnome/help/evolution/de/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/de/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/de/figures/evo_dialog-info.png
+share/gnome/help/evolution/de/figures/evo_dialog-warning.png
 share/gnome/help/evolution/de/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/de/figures/evo_edit_search.png
 share/gnome/help/evolution/de/figures/evo_email_a.png
@@ -665,6 +843,8 @@ share/gnome/help/evolution/de/figures/evo_imapheader_a.png
 share/gnome/help/evolution/de/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/de/figures/evo_import_asst_a.png
 share/gnome/help/evolution/de/figures/evo_junk_a.png
+share/gnome/help/evolution/de/figures/evo_label_a.png
+share/gnome/help/evolution/de/figures/evo_labels_a.png
 share/gnome/help/evolution/de/figures/evo_mail_a.png
 share/gnome/help/evolution/de/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/de/figures/evo_mail_notifier.png
@@ -711,6 +891,7 @@ share/gnome/help/evolution/de/figures/full-4.png
 share/gnome/help/evolution/de/figures/full-5.png
 share/gnome/help/evolution/de/figures/full-6.png
 share/gnome/help/evolution/de/figures/full-7.png
+share/gnome/help/evolution/de/figures/google_cal_view.png
 share/gnome/help/evolution/de/figures/mail-druid-pic.png
 share/gnome/help/evolution/de/figures/mail-inbox.png
 share/gnome/help/evolution/de/figures/mail-threaded.png
@@ -762,7 +943,12 @@ share/gnome/help/evolution/el/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/el/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/el/figures/evo_calstatus_a.png
 share/gnome/help/evolution/el/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/el/figures/evo_crash_recovery.png
+share/gnome/help/evolution/el/figures/evo_custom_header.png
+share/gnome/help/evolution/el/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/el/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/el/figures/evo_dialog-info.png
+share/gnome/help/evolution/el/figures/evo_dialog-warning.png
 share/gnome/help/evolution/el/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/el/figures/evo_edit_search.png
 share/gnome/help/evolution/el/figures/evo_email_a.png
@@ -777,6 +963,8 @@ share/gnome/help/evolution/el/figures/evo_imapheader_a.png
 share/gnome/help/evolution/el/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/el/figures/evo_import_asst_a.png
 share/gnome/help/evolution/el/figures/evo_junk_a.png
+share/gnome/help/evolution/el/figures/evo_label_a.png
+share/gnome/help/evolution/el/figures/evo_labels_a.png
 share/gnome/help/evolution/el/figures/evo_mail_a.png
 share/gnome/help/evolution/el/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/el/figures/evo_mail_notifier.png
@@ -823,6 +1011,7 @@ share/gnome/help/evolution/el/figures/full-4.png
 share/gnome/help/evolution/el/figures/full-5.png
 share/gnome/help/evolution/el/figures/full-6.png
 share/gnome/help/evolution/el/figures/full-7.png
+share/gnome/help/evolution/el/figures/google_cal_view.png
 share/gnome/help/evolution/el/figures/mail-druid-pic.png
 share/gnome/help/evolution/el/figures/mail-inbox.png
 share/gnome/help/evolution/el/figures/mail-threaded.png
@@ -874,7 +1063,12 @@ share/gnome/help/evolution/en_GB/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/en_GB/figures/evo_calstatus_a.png
 share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_crash_recovery.png
+share/gnome/help/evolution/en_GB/figures/evo_custom_header.png
+share/gnome/help/evolution/en_GB/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/en_GB/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/en_GB/figures/evo_dialog-info.png
+share/gnome/help/evolution/en_GB/figures/evo_dialog-warning.png
 share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
 share/gnome/help/evolution/en_GB/figures/evo_email_a.png
@@ -889,6 +1083,8 @@ share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
 share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
 share/gnome/help/evolution/en_GB/figures/evo_junk_a.png
+share/gnome/help/evolution/en_GB/figures/evo_label_a.png
+share/gnome/help/evolution/en_GB/figures/evo_labels_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png
@@ -935,6 +1131,7 @@ share/gnome/help/evolution/en_GB/figures/full-4.png
 share/gnome/help/evolution/en_GB/figures/full-5.png
 share/gnome/help/evolution/en_GB/figures/full-6.png
 share/gnome/help/evolution/en_GB/figures/full-7.png
+share/gnome/help/evolution/en_GB/figures/google_cal_view.png
 share/gnome/help/evolution/en_GB/figures/mail-druid-pic.png
 share/gnome/help/evolution/en_GB/figures/mail-inbox.png
 share/gnome/help/evolution/en_GB/figures/mail-threaded.png
@@ -986,7 +1183,12 @@ share/gnome/help/evolution/es/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/es/figures/evo_calstatus_a.png
 share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/es/figures/evo_crash_recovery.png
+share/gnome/help/evolution/es/figures/evo_custom_header.png
+share/gnome/help/evolution/es/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/es/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/es/figures/evo_dialog-info.png
+share/gnome/help/evolution/es/figures/evo_dialog-warning.png
 share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/es/figures/evo_edit_search.png
 share/gnome/help/evolution/es/figures/evo_email_a.png
@@ -1001,6 +1203,8 @@ share/gnome/help/evolution/es/figures/evo_imapheader_a.png
 share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/es/figures/evo_import_asst_a.png
 share/gnome/help/evolution/es/figures/evo_junk_a.png
+share/gnome/help/evolution/es/figures/evo_label_a.png
+share/gnome/help/evolution/es/figures/evo_labels_a.png
 share/gnome/help/evolution/es/figures/evo_mail_a.png
 share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/es/figures/evo_mail_notifier.png
@@ -1047,6 +1251,7 @@ share/gnome/help/evolution/es/figures/full-4.png
 share/gnome/help/evolution/es/figures/full-5.png
 share/gnome/help/evolution/es/figures/full-6.png
 share/gnome/help/evolution/es/figures/full-7.png
+share/gnome/help/evolution/es/figures/google_cal_view.png
 share/gnome/help/evolution/es/figures/mail-druid-pic.png
 share/gnome/help/evolution/es/figures/mail-inbox.png
 share/gnome/help/evolution/es/figures/mail-threaded.png
@@ -1098,7 +1303,12 @@ share/gnome/help/evolution/fr/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/fr/figures/evo_calstatus_a.png
 share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/fr/figures/evo_crash_recovery.png
+share/gnome/help/evolution/fr/figures/evo_custom_header.png
+share/gnome/help/evolution/fr/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/fr/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/fr/figures/evo_dialog-info.png
+share/gnome/help/evolution/fr/figures/evo_dialog-warning.png
 share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/fr/figures/evo_edit_search.png
 share/gnome/help/evolution/fr/figures/evo_email_a.png
@@ -1113,6 +1323,8 @@ share/gnome/help/evolution/fr/figures/evo_imapheader_a.png
 share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_import_asst_a.png
 share/gnome/help/evolution/fr/figures/evo_junk_a.png
+share/gnome/help/evolution/fr/figures/evo_label_a.png
+share/gnome/help/evolution/fr/figures/evo_labels_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_notifier.png
@@ -1159,6 +1371,7 @@ share/gnome/help/evolution/fr/figures/full-4.png
 share/gnome/help/evolution/fr/figures/full-5.png
 share/gnome/help/evolution/fr/figures/full-6.png
 share/gnome/help/evolution/fr/figures/full-7.png
+share/gnome/help/evolution/fr/figures/google_cal_view.png
 share/gnome/help/evolution/fr/figures/mail-druid-pic.png
 share/gnome/help/evolution/fr/figures/mail-inbox.png
 share/gnome/help/evolution/fr/figures/mail-threaded.png
@@ -1179,6 +1392,126 @@ share/gnome/help/evolution/fr/figures/sub-others-folder.png
 share/gnome/help/evolution/fr/figures/sub-pub-fold.png
 share/gnome/help/evolution/fr/figures/ver_view_a.png
 share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/mk/evolution.xml
+share/gnome/help/evolution/mk/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/mk/figures/account_editor_a.png
+share/gnome/help/evolution/mk/figures/addrs_book_a.png
+share/gnome/help/evolution/mk/figures/attach_reminder_a.png.png
+share/gnome/help/evolution/mk/figures/calendar.png
+share/gnome/help/evolution/mk/figures/categories_a.png
+share/gnome/help/evolution/mk/figures/collap_head_a.png
+share/gnome/help/evolution/mk/figures/config-cal.png
+share/gnome/help/evolution/mk/figures/config-mail.png
+share/gnome/help/evolution/mk/figures/contact-editor.png
+share/gnome/help/evolution/mk/figures/contact.png
+share/gnome/help/evolution/mk/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/mk/figures/delgt-add.png
+share/gnome/help/evolution/mk/figures/evo_account_editor_a.png
+share/gnome/help/evolution/mk/figures/evo_account_info_a.png
+share/gnome/help/evolution/mk/figures/evo_add_rule_a.png
+share/gnome/help/evolution/mk/figures/evo_adv_search_a.png
+share/gnome/help/evolution/mk/figures/evo_allday_a.png
+share/gnome/help/evolution/mk/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/mk/figures/evo_backup.png
+share/gnome/help/evolution/mk/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/mk/figures/evo_backup_warning.png
+share/gnome/help/evolution/mk/figures/evo_blink.png
+share/gnome/help/evolution/mk/figures/evo_cal_a.png
+share/gnome/help/evolution/mk/figures/evo_cal_advsearch.png
+share/gnome/help/evolution/mk/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/mk/figures/evo_cal_prop_a.png
+share/gnome/help/evolution/mk/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/mk/figures/evo_calstatus_a.png
+share/gnome/help/evolution/mk/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/mk/figures/evo_crash_recovery.png
+share/gnome/help/evolution/mk/figures/evo_custom_header.png
+share/gnome/help/evolution/mk/figures/evo_debuglogs_a.png
+share/gnome/help/evolution/mk/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/mk/figures/evo_dialog-info.png
+share/gnome/help/evolution/mk/figures/evo_dialog-warning.png
+share/gnome/help/evolution/mk/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/mk/figures/evo_edit_search.png
+share/gnome/help/evolution/mk/figures/evo_email_a.png
+share/gnome/help/evolution/mk/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/mk/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/mk/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/mk/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/mk/figures/evo_identity_a.png
+share/gnome/help/evolution/mk/figures/evo_identityedit_a.png
+share/gnome/help/evolution/mk/figures/evo_imapheader_a.png
+share/gnome/help/evolution/mk/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_import_asst_a.png
+share/gnome/help/evolution/mk/figures/evo_junk_a.png
+share/gnome/help/evolution/mk/figures/evo_label_a.png
+share/gnome/help/evolution/mk/figures/evo_labels_a.png
+share/gnome/help/evolution/mk/figures/evo_mail_a.png
+share/gnome/help/evolution/mk/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/mk/figures/evo_mail_notifier.png
+share/gnome/help/evolution/mk/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_memo_a.png
+share/gnome/help/evolution/mk/figures/evo_mereceive_a.png
+share/gnome/help/evolution/mk/figures/evo_message_filters_a.png
+share/gnome/help/evolution/mk/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_newmail.png
+share/gnome/help/evolution/mk/figures/evo_newmess_a.png
+share/gnome/help/evolution/mk/figures/evo_offline.png
+share/gnome/help/evolution/mk/figures/evo_popreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/mk/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/mk/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/mk/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/mk/figures/evo_rule_a.png
+share/gnome/help/evolution/mk/figures/evo_select_add_folder.png
+share/gnome/help/evolution/mk/figures/evo_select_folder.png
+share/gnome/help/evolution/mk/figures/evo_send_option_a.png
+share/gnome/help/evolution/mk/figures/evo_send_setup_a.png
+share/gnome/help/evolution/mk/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/mk/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/mk/figures/evo_timezone_a.png
+share/gnome/help/evolution/mk/figures/evo_usereceive_a.png
+share/gnome/help/evolution/mk/figures/exchange-delegation.png
+share/gnome/help/evolution/mk/figures/exchange-identity.png
+share/gnome/help/evolution/mk/figures/exchange-receive-options.png
+share/gnome/help/evolution/mk/figures/exchange-receive.png
+share/gnome/help/evolution/mk/figures/exchg-identity.png
+share/gnome/help/evolution/mk/figures/exchng-identity.png
+share/gnome/help/evolution/mk/figures/exchng-rec-mail.png
+share/gnome/help/evolution/mk/figures/exchng-rec-mails.png
+share/gnome/help/evolution/mk/figures/exchng-rec-option.png
+share/gnome/help/evolution/mk/figures/exchng-rec-options.png
+share/gnome/help/evolution/mk/figures/exchng-settings.png
+share/gnome/help/evolution/mk/figures/filter-new-fig.png
+share/gnome/help/evolution/mk/figures/free_busy.png
+share/gnome/help/evolution/mk/figures/full-1.png
+share/gnome/help/evolution/mk/figures/full-2.png
+share/gnome/help/evolution/mk/figures/full-3.png
+share/gnome/help/evolution/mk/figures/full-4.png
+share/gnome/help/evolution/mk/figures/full-5.png
+share/gnome/help/evolution/mk/figures/full-6.png
+share/gnome/help/evolution/mk/figures/full-7.png
+share/gnome/help/evolution/mk/figures/google_cal_view.png
+share/gnome/help/evolution/mk/figures/mail-druid-pic.png
+share/gnome/help/evolution/mk/figures/mail-inbox.png
+share/gnome/help/evolution/mk/figures/mail-threaded.png
+share/gnome/help/evolution/mk/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/mk/figures/mailer_preferences.png
+share/gnome/help/evolution/mk/figures/mainwindow-pic.png
+share/gnome/help/evolution/mk/figures/minus.png
+share/gnome/help/evolution/mk/figures/newmsg.png
+share/gnome/help/evolution/mk/figures/plus.png
+share/gnome/help/evolution/mk/figures/proxy-cal.png
+share/gnome/help/evolution/mk/figures/proxy-login.png
+share/gnome/help/evolution/mk/figures/quick_add_a.png
+share/gnome/help/evolution/mk/figures/quick_reference.png
+share/gnome/help/evolution/mk/figures/replymsg.png
+share/gnome/help/evolution/mk/figures/schedule.png
+share/gnome/help/evolution/mk/figures/stock_search.png
+share/gnome/help/evolution/mk/figures/sub-others-folder.png
+share/gnome/help/evolution/mk/figures/sub-pub-fold.png
+share/gnome/help/evolution/mk/figures/ver_view_a.png
+share/gnome/help/evolution/mk/figures/vfolder-createrule-fig.png
 share/gnome/help/evolution/oc/evolution.xml
 share/gnome/help/evolution/oc/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution/oc/figures/account_editor_a.png
@@ -1210,7 +1543,12 @@ share/gnome/help/evolution/oc/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/oc/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/oc/figures/evo_calstatus_a.png
 share/gnome/help/evolution/oc/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/oc/figures/evo_crash_recovery.png
+share/gnome/help/evolution/oc/figures/evo_custom_header.png
+share/gnome/help/evolution/oc/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/oc/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/oc/figures/evo_dialog-info.png
+share/gnome/help/evolution/oc/figures/evo_dialog-warning.png
 share/gnome/help/evolution/oc/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/oc/figures/evo_edit_search.png
 share/gnome/help/evolution/oc/figures/evo_email_a.png
@@ -1225,6 +1563,8 @@ share/gnome/help/evolution/oc/figures/evo_imapheader_a.png
 share/gnome/help/evolution/oc/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_import_asst_a.png
 share/gnome/help/evolution/oc/figures/evo_junk_a.png
+share/gnome/help/evolution/oc/figures/evo_label_a.png
+share/gnome/help/evolution/oc/figures/evo_labels_a.png
 share/gnome/help/evolution/oc/figures/evo_mail_a.png
 share/gnome/help/evolution/oc/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/oc/figures/evo_mail_notifier.png
@@ -1271,6 +1611,7 @@ share/gnome/help/evolution/oc/figures/full-4.png
 share/gnome/help/evolution/oc/figures/full-5.png
 share/gnome/help/evolution/oc/figures/full-6.png
 share/gnome/help/evolution/oc/figures/full-7.png
+share/gnome/help/evolution/oc/figures/google_cal_view.png
 share/gnome/help/evolution/oc/figures/mail-druid-pic.png
 share/gnome/help/evolution/oc/figures/mail-inbox.png
 share/gnome/help/evolution/oc/figures/mail-threaded.png
@@ -1322,7 +1663,12 @@ share/gnome/help/evolution/ru/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/ru/figures/evo_calstatus_a.png
 share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/ru/figures/evo_crash_recovery.png
+share/gnome/help/evolution/ru/figures/evo_custom_header.png
+share/gnome/help/evolution/ru/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/ru/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/ru/figures/evo_dialog-info.png
+share/gnome/help/evolution/ru/figures/evo_dialog-warning.png
 share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/ru/figures/evo_edit_search.png
 share/gnome/help/evolution/ru/figures/evo_email_a.png
@@ -1337,6 +1683,8 @@ share/gnome/help/evolution/ru/figures/evo_imapheader_a.png
 share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_import_asst_a.png
 share/gnome/help/evolution/ru/figures/evo_junk_a.png
+share/gnome/help/evolution/ru/figures/evo_label_a.png
+share/gnome/help/evolution/ru/figures/evo_labels_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_notifier.png
@@ -1383,6 +1731,7 @@ share/gnome/help/evolution/ru/figures/full-4.png
 share/gnome/help/evolution/ru/figures/full-5.png
 share/gnome/help/evolution/ru/figures/full-6.png
 share/gnome/help/evolution/ru/figures/full-7.png
+share/gnome/help/evolution/ru/figures/google_cal_view.png
 share/gnome/help/evolution/ru/figures/mail-druid-pic.png
 share/gnome/help/evolution/ru/figures/mail-inbox.png
 share/gnome/help/evolution/ru/figures/mail-threaded.png
@@ -1434,7 +1783,12 @@ share/gnome/help/evolution/sv/figures/evo_cal_prop_a.png
 share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
 share/gnome/help/evolution/sv/figures/evo_calstatus_a.png
 share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/sv/figures/evo_crash_recovery.png
+share/gnome/help/evolution/sv/figures/evo_custom_header.png
+share/gnome/help/evolution/sv/figures/evo_debuglogs_a.png
 share/gnome/help/evolution/sv/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/sv/figures/evo_dialog-info.png
+share/gnome/help/evolution/sv/figures/evo_dialog-warning.png
 share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
 share/gnome/help/evolution/sv/figures/evo_edit_search.png
 share/gnome/help/evolution/sv/figures/evo_email_a.png
@@ -1449,6 +1803,8 @@ share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
 share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
 share/gnome/help/evolution/sv/figures/evo_junk_a.png
+share/gnome/help/evolution/sv/figures/evo_label_a.png
+share/gnome/help/evolution/sv/figures/evo_labels_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_notifier.png
@@ -1495,6 +1851,7 @@ share/gnome/help/evolution/sv/figures/full-4.png
 share/gnome/help/evolution/sv/figures/full-5.png
 share/gnome/help/evolution/sv/figures/full-6.png
 share/gnome/help/evolution/sv/figures/full-7.png
+share/gnome/help/evolution/sv/figures/google_cal_view.png
 share/gnome/help/evolution/sv/figures/mail-druid-pic.png
 share/gnome/help/evolution/sv/figures/mail-inbox.png
 share/gnome/help/evolution/sv/figures/mail-threaded.png
@@ -1519,115 +1876,116 @@ share/icons/hicolor/16x16/apps/evolution.png
 share/icons/hicolor/22x22/apps/evolution.png
 share/icons/hicolor/24x24/apps/evolution.png
 share/icons/hicolor/32x32/apps/evolution.png
-share/icons/hicolor/48x48/apps/preferences-autocompletion.png
-share/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png
-share/icons/hicolor/48x48/apps/preferences-certificates.png
-share/icons/hicolor/48x48/apps/preferences-composer.png
-share/icons/hicolor/48x48/apps/preferences-mail-accounts.png
-share/icons/hicolor/48x48/apps/preferences-mail.png
+share/icons/hicolor/48x48/apps/evolution.png
 share/icons/hicolor/scalable/apps/evolution.svg
-share/idl/evolution-2.12/Composer.idl
-share/idl/evolution-2.12/Evolution-Component.idl
-share/idl/evolution-2.12/Evolution-Composer.idl
-share/idl/evolution-2.12/Evolution-ConfigControl.idl
-share/idl/evolution-2.12/Evolution-Mail.idl
-share/idl/evolution-2.12/Evolution-Shell.idl
-share/idl/evolution-2.12/Evolution.idl
-share/idl/evolution-2.12/evolution-calendar.idl
-share/locale/am/LC_MESSAGES/evolution-2.12.mo
-share/locale/ar/LC_MESSAGES/evolution-2.12.mo
-share/locale/as/LC_MESSAGES/evolution-2.12.mo
-share/locale/az/LC_MESSAGES/evolution-2.12.mo
-share/locale/be/LC_MESSAGES/evolution-2.12.mo
-share/locale/bg/LC_MESSAGES/evolution-2.12.mo
-share/locale/bn/LC_MESSAGES/evolution-2.12.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-2.12.mo
-share/locale/bs/LC_MESSAGES/evolution-2.12.mo
-share/locale/ca/LC_MESSAGES/evolution-2.12.mo
-share/locale/cs/LC_MESSAGES/evolution-2.12.mo
-share/locale/cy/LC_MESSAGES/evolution-2.12.mo
-share/locale/da/LC_MESSAGES/evolution-2.12.mo
-share/locale/de/LC_MESSAGES/evolution-2.12.mo
-share/locale/dz/LC_MESSAGES/evolution-2.12.mo
-share/locale/el/LC_MESSAGES/evolution-2.12.mo
-share/locale/en_AU/LC_MESSAGES/evolution-2.12.mo
-share/locale/en_CA/LC_MESSAGES/evolution-2.12.mo
-share/locale/en_GB/LC_MESSAGES/evolution-2.12.mo
-share/locale/es/LC_MESSAGES/evolution-2.12.mo
-share/locale/et/LC_MESSAGES/evolution-2.12.mo
-share/locale/eu/LC_MESSAGES/evolution-2.12.mo
-share/locale/fa/LC_MESSAGES/evolution-2.12.mo
-share/locale/fi/LC_MESSAGES/evolution-2.12.mo
-share/locale/fr/LC_MESSAGES/evolution-2.12.mo
-share/locale/ga/LC_MESSAGES/evolution-2.12.mo
-share/locale/gl/LC_MESSAGES/evolution-2.12.mo
-share/locale/gu/LC_MESSAGES/evolution-2.12.mo
-share/locale/he/LC_MESSAGES/evolution-2.12.mo
-share/locale/hi/LC_MESSAGES/evolution-2.12.mo
-share/locale/hr/LC_MESSAGES/evolution-2.12.mo
-share/locale/hu/LC_MESSAGES/evolution-2.12.mo
-share/locale/id/LC_MESSAGES/evolution-2.12.mo
-share/locale/is/LC_MESSAGES/evolution-2.12.mo
-share/locale/it/LC_MESSAGES/evolution-2.12.mo
-share/locale/ja/LC_MESSAGES/evolution-2.12.mo
-share/locale/ka/LC_MESSAGES/evolution-2.12.mo
-share/locale/ko/LC_MESSAGES/evolution-2.12.mo
-share/locale/ku/LC_MESSAGES/evolution-2.12.mo
-share/locale/lt/LC_MESSAGES/evolution-2.12.mo
-share/locale/lv/LC_MESSAGES/evolution-2.12.mo
-share/locale/mk/LC_MESSAGES/evolution-2.12.mo
-share/locale/ml/LC_MESSAGES/evolution-2.12.mo
-share/locale/mn/LC_MESSAGES/evolution-2.12.mo
-share/locale/mr/LC_MESSAGES/evolution-2.12.mo
-share/locale/ms/LC_MESSAGES/evolution-2.12.mo
-share/locale/nb/LC_MESSAGES/evolution-2.12.mo
-share/locale/ne/LC_MESSAGES/evolution-2.12.mo
-share/locale/nl/LC_MESSAGES/evolution-2.12.mo
-share/locale/nn/LC_MESSAGES/evolution-2.12.mo
-share/locale/oc/LC_MESSAGES/evolution-2.12.mo
-share/locale/or/LC_MESSAGES/evolution-2.12.mo
-share/locale/pa/LC_MESSAGES/evolution-2.12.mo
-share/locale/pl/LC_MESSAGES/evolution-2.12.mo
-share/locale/pt/LC_MESSAGES/evolution-2.12.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-2.12.mo
-share/locale/ro/LC_MESSAGES/evolution-2.12.mo
-share/locale/ru/LC_MESSAGES/evolution-2.12.mo
-share/locale/rw/LC_MESSAGES/evolution-2.12.mo
-share/locale/si/LC_MESSAGES/evolution-2.12.mo
-share/locale/sk/LC_MESSAGES/evolution-2.12.mo
-share/locale/sl/LC_MESSAGES/evolution-2.12.mo
-share/locale/sq/LC_MESSAGES/evolution-2.12.mo
-share/locale/sr/LC_MESSAGES/evolution-2.12.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-2.12.mo
-share/locale/sv/LC_MESSAGES/evolution-2.12.mo
-share/locale/ta/LC_MESSAGES/evolution-2.12.mo
-share/locale/te/LC_MESSAGES/evolution-2.12.mo
-share/locale/th/LC_MESSAGES/evolution-2.12.mo
-share/locale/tr/LC_MESSAGES/evolution-2.12.mo
-share/locale/uk/LC_MESSAGES/evolution-2.12.mo
-share/locale/vi/LC_MESSAGES/evolution-2.12.mo
-share/locale/wa/LC_MESSAGES/evolution-2.12.mo
-share/locale/xh/LC_MESSAGES/evolution-2.12.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-2.12.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-2.12.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-2.12.mo
+share/idl/evolution-2.22/Composer.idl
+share/idl/evolution-2.22/Evolution-Component.idl
+share/idl/evolution-2.22/Evolution-Composer.idl
+share/idl/evolution-2.22/Evolution-ConfigControl.idl
+share/idl/evolution-2.22/Evolution-Mail.idl
+share/idl/evolution-2.22/Evolution-Shell.idl
+share/idl/evolution-2.22/Evolution.idl
+share/idl/evolution-2.22/evolution-calendar.idl
+share/locale/am/LC_MESSAGES/evolution-2.22.mo
+share/locale/ar/LC_MESSAGES/evolution-2.22.mo
+share/locale/as/LC_MESSAGES/evolution-2.22.mo
+share/locale/az/LC_MESSAGES/evolution-2.22.mo
+share/locale/be/LC_MESSAGES/evolution-2.22.mo
+share/locale/be@latin/LC_MESSAGES/evolution-2.22.mo
+share/locale/bg/LC_MESSAGES/evolution-2.22.mo
+share/locale/bn/LC_MESSAGES/evolution-2.22.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-2.22.mo
+share/locale/bs/LC_MESSAGES/evolution-2.22.mo
+share/locale/ca/LC_MESSAGES/evolution-2.22.mo
+share/locale/cs/LC_MESSAGES/evolution-2.22.mo
+share/locale/cy/LC_MESSAGES/evolution-2.22.mo
+share/locale/da/LC_MESSAGES/evolution-2.22.mo
+share/locale/de/LC_MESSAGES/evolution-2.22.mo
+share/locale/dz/LC_MESSAGES/evolution-2.22.mo
+share/locale/el/LC_MESSAGES/evolution-2.22.mo
+share/locale/en_AU/LC_MESSAGES/evolution-2.22.mo
+share/locale/en_CA/LC_MESSAGES/evolution-2.22.mo
+share/locale/en_GB/LC_MESSAGES/evolution-2.22.mo
+share/locale/es/LC_MESSAGES/evolution-2.22.mo
+share/locale/et/LC_MESSAGES/evolution-2.22.mo
+share/locale/eu/LC_MESSAGES/evolution-2.22.mo
+share/locale/fa/LC_MESSAGES/evolution-2.22.mo
+share/locale/fi/LC_MESSAGES/evolution-2.22.mo
+share/locale/fr/LC_MESSAGES/evolution-2.22.mo
+share/locale/ga/LC_MESSAGES/evolution-2.22.mo
+share/locale/gl/LC_MESSAGES/evolution-2.22.mo
+share/locale/gu/LC_MESSAGES/evolution-2.22.mo
+share/locale/he/LC_MESSAGES/evolution-2.22.mo
+share/locale/hi/LC_MESSAGES/evolution-2.22.mo
+share/locale/hr/LC_MESSAGES/evolution-2.22.mo
+share/locale/hu/LC_MESSAGES/evolution-2.22.mo
+share/locale/id/LC_MESSAGES/evolution-2.22.mo
+share/locale/is/LC_MESSAGES/evolution-2.22.mo
+share/locale/it/LC_MESSAGES/evolution-2.22.mo
+share/locale/ja/LC_MESSAGES/evolution-2.22.mo
+share/locale/ka/LC_MESSAGES/evolution-2.22.mo
+share/locale/kn/LC_MESSAGES/evolution-2.22.mo
+share/locale/ko/LC_MESSAGES/evolution-2.22.mo
+share/locale/ku/LC_MESSAGES/evolution-2.22.mo
+share/locale/lt/LC_MESSAGES/evolution-2.22.mo
+share/locale/lv/LC_MESSAGES/evolution-2.22.mo
+share/locale/mk/LC_MESSAGES/evolution-2.22.mo
+share/locale/ml/LC_MESSAGES/evolution-2.22.mo
+share/locale/mn/LC_MESSAGES/evolution-2.22.mo
+share/locale/mr/LC_MESSAGES/evolution-2.22.mo
+share/locale/ms/LC_MESSAGES/evolution-2.22.mo
+share/locale/nb/LC_MESSAGES/evolution-2.22.mo
+share/locale/ne/LC_MESSAGES/evolution-2.22.mo
+share/locale/nl/LC_MESSAGES/evolution-2.22.mo
+share/locale/nn/LC_MESSAGES/evolution-2.22.mo
+share/locale/oc/LC_MESSAGES/evolution-2.22.mo
+share/locale/or/LC_MESSAGES/evolution-2.22.mo
+share/locale/pa/LC_MESSAGES/evolution-2.22.mo
+share/locale/pl/LC_MESSAGES/evolution-2.22.mo
+share/locale/pt/LC_MESSAGES/evolution-2.22.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-2.22.mo
+share/locale/ro/LC_MESSAGES/evolution-2.22.mo
+share/locale/ru/LC_MESSAGES/evolution-2.22.mo
+share/locale/rw/LC_MESSAGES/evolution-2.22.mo
+share/locale/si/LC_MESSAGES/evolution-2.22.mo
+share/locale/sk/LC_MESSAGES/evolution-2.22.mo
+share/locale/sl/LC_MESSAGES/evolution-2.22.mo
+share/locale/sq/LC_MESSAGES/evolution-2.22.mo
+share/locale/sr/LC_MESSAGES/evolution-2.22.mo
+share/locale/sr@Latn/LC_MESSAGES/evolution-2.22.mo
+share/locale/sv/LC_MESSAGES/evolution-2.22.mo
+share/locale/ta/LC_MESSAGES/evolution-2.22.mo
+share/locale/te/LC_MESSAGES/evolution-2.22.mo
+share/locale/th/LC_MESSAGES/evolution-2.22.mo
+share/locale/tr/LC_MESSAGES/evolution-2.22.mo
+share/locale/uk/LC_MESSAGES/evolution-2.22.mo
+share/locale/vi/LC_MESSAGES/evolution-2.22.mo
+share/locale/wa/LC_MESSAGES/evolution-2.22.mo
+share/locale/xh/LC_MESSAGES/evolution-2.22.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-2.22.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-2.22.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-2.22.mo
 share/mime-info/evolution.keys
 share/mime-info/evolution.mime
 share/omf/evolution/evolution-C.omf
+share/omf/evolution/evolution-cs.omf
 share/omf/evolution/evolution-de.omf
 share/omf/evolution/evolution-el.omf
 share/omf/evolution/evolution-en_GB.omf
 share/omf/evolution/evolution-es.omf
 share/omf/evolution/evolution-fr.omf
+share/omf/evolution/evolution-mk.omf
 share/omf/evolution/evolution-oc.omf
 share/omf/evolution/evolution-ru.omf
 share/omf/evolution/evolution-sv.omf
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/evolution
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/idl/evolution-2.12
+@dirrm share/idl/evolution-2.22
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
@@ -1640,6 +1998,8 @@ share/omf/evolution/evolution-sv.omf
 @dirrm share/gnome/help/evolution/ru
 @dirrm share/gnome/help/evolution/oc/figures
 @dirrm share/gnome/help/evolution/oc
+@dirrm share/gnome/help/evolution/mk/figures
+@dirrm share/gnome/help/evolution/mk
 @dirrm share/gnome/help/evolution/fr/figures
 @dirrm share/gnome/help/evolution/fr
 @dirrm share/gnome/help/evolution/es/figures
@@ -1650,96 +2010,120 @@ share/omf/evolution/evolution-sv.omf
 @dirrm share/gnome/help/evolution/el
 @dirrm share/gnome/help/evolution/de/figures
 @dirrm share/gnome/help/evolution/de
+@dirrm share/gnome/help/evolution/cs/figures
+@dirrm share/gnome/help/evolution/cs
 @dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
-@dirrm share/evolution/2.12/weather
-@dirrm share/evolution/2.12/views/tasks
-@dirrm share/evolution/2.12/views/memos
-@dirrm share/evolution/2.12/views/mail
-@dirrm share/evolution/2.12/views/calendar
-@dirrm share/evolution/2.12/views/addressbook
-@dirrm share/evolution/2.12/views
-@dirrm share/evolution/2.12/ui
-@dirrm share/evolution/2.12/images
-@dirrm share/evolution/2.12/help/quickref/sv
-@dirrm share/evolution/2.12/help/quickref/sq
-@dirrm share/evolution/2.12/help/quickref/pt
-@dirrm share/evolution/2.12/help/quickref/pl
-@dirrm share/evolution/2.12/help/quickref/it
-@dirrm share/evolution/2.12/help/quickref/fr
-@dirrm share/evolution/2.12/help/quickref/es
-@dirrm share/evolution/2.12/help/quickref/de
-@dirrm share/evolution/2.12/help/quickref/C
-@dirrm share/evolution/2.12/help/quickref
-@dirrm share/evolution/2.12/help
-@dirrm share/evolution/2.12/glade
-@dirrm share/evolution/2.12/etspec
-@dirrm share/evolution/2.12/errors
-@dirrm share/evolution/2.12/ecps
-@dirrm share/evolution/2.12/default/zh_CN/mail/local
-@dirrm share/evolution/2.12/default/zh_CN/mail
-@dirrm share/evolution/2.12/default/zh_CN
-@dirrm share/evolution/2.12/default/sv/mail/local
-@dirrm share/evolution/2.12/default/sv/mail
-@dirrm share/evolution/2.12/default/sv
-@dirrm share/evolution/2.12/default/pt/mail/local
-@dirrm share/evolution/2.12/default/pt/mail
-@dirrm share/evolution/2.12/default/pt
-@dirrm share/evolution/2.12/default/pl/mail/local
-@dirrm share/evolution/2.12/default/pl/mail
-@dirrm share/evolution/2.12/default/pl
-@dirrm share/evolution/2.12/default/nl/mail/local
-@dirrm share/evolution/2.12/default/nl/mail
-@dirrm share/evolution/2.12/default/nl
-@dirrm share/evolution/2.12/default/mk/mail/local
-@dirrm share/evolution/2.12/default/mk/mail
-@dirrm share/evolution/2.12/default/mk
-@dirrm share/evolution/2.12/default/lt/mail/local
-@dirrm share/evolution/2.12/default/lt/mail
-@dirrm share/evolution/2.12/default/lt
-@dirrm share/evolution/2.12/default/ja/mail/local
-@dirrm share/evolution/2.12/default/ja/mail
-@dirrm share/evolution/2.12/default/ja
-@dirrm share/evolution/2.12/default/fr/mail/local
-@dirrm share/evolution/2.12/default/fr/mail
-@dirrm share/evolution/2.12/default/fr
-@dirrm share/evolution/2.12/default/fi/mail/local
-@dirrm share/evolution/2.12/default/fi/mail
-@dirrm share/evolution/2.12/default/fi
-@dirrm share/evolution/2.12/default/es/mail/local
-@dirrm share/evolution/2.12/default/es/mail
-@dirrm share/evolution/2.12/default/es
-@dirrm share/evolution/2.12/default/de/mail/local
-@dirrm share/evolution/2.12/default/de/mail
-@dirrm share/evolution/2.12/default/de
-@dirrm share/evolution/2.12/default/C/mail/local
-@dirrm share/evolution/2.12/default/C/mail
-@dirrm share/evolution/2.12/default/C
-@dirrm share/evolution/2.12/default
-@dirrm share/evolution/2.12
+@dirrm share/evolution/2.22/weather
+@dirrm share/evolution/2.22/views/tasks
+@dirrm share/evolution/2.22/views/memos
+@dirrm share/evolution/2.22/views/mail
+@dirrm share/evolution/2.22/views/calendar
+@dirrm share/evolution/2.22/views/addressbook
+@dirrm share/evolution/2.22/views
+@dirrm share/evolution/2.22/ui
+@dirrm share/evolution/2.22/sounds
+@dirrm share/evolution/2.22/images
+@dirrm share/evolution/2.22/icons/hicolor/scalable/actions
+@dirrm share/evolution/2.22/icons/hicolor/scalable
+@dirrm share/evolution/2.22/icons/hicolor/48x48/categories
+@dirrm share/evolution/2.22/icons/hicolor/48x48
+@dirrm share/evolution/2.22/icons/hicolor/32x32/actions
+@dirrm share/evolution/2.22/icons/hicolor/32x32
+@dirrm share/evolution/2.22/icons/hicolor/24x24/places
+@dirrm share/evolution/2.22/icons/hicolor/24x24/actions
+@dirrm share/evolution/2.22/icons/hicolor/24x24
+@dirrm share/evolution/2.22/icons/hicolor/22x22/places
+@dirrm share/evolution/2.22/icons/hicolor/22x22/actions
+@dirrm share/evolution/2.22/icons/hicolor/22x22
+@dirrm share/evolution/2.22/icons/hicolor/16x16/places
+@dirrm share/evolution/2.22/icons/hicolor/16x16/actions
+@dirrm share/evolution/2.22/icons/hicolor/16x16
+@dirrm share/evolution/2.22/icons/hicolor
+@dirrm share/evolution/2.22/icons
+@dirrm share/evolution/2.22/help/quickref/sv
+@dirrm share/evolution/2.22/help/quickref/sq
+@dirrm share/evolution/2.22/help/quickref/pt
+@dirrm share/evolution/2.22/help/quickref/pl
+@dirrm share/evolution/2.22/help/quickref/it
+@dirrm share/evolution/2.22/help/quickref/hu
+@dirrm share/evolution/2.22/help/quickref/fr
+@dirrm share/evolution/2.22/help/quickref/es
+@dirrm share/evolution/2.22/help/quickref/de
+@dirrm share/evolution/2.22/help/quickref/C
+@dirrm share/evolution/2.22/help/quickref
+@dirrm share/evolution/2.22/help
+@dirrm share/evolution/2.22/glade
+@dirrm share/evolution/2.22/etspec
+@dirrm share/evolution/2.22/errors
+@dirrm share/evolution/2.22/ecps
+@dirrm share/evolution/2.22/default/zh_CN/mail/local
+@dirrm share/evolution/2.22/default/zh_CN/mail
+@dirrm share/evolution/2.22/default/zh_CN
+@dirrm share/evolution/2.22/default/sv/mail/local
+@dirrm share/evolution/2.22/default/sv/mail
+@dirrm share/evolution/2.22/default/sv
+@dirrm share/evolution/2.22/default/pt/mail/local
+@dirrm share/evolution/2.22/default/pt/mail
+@dirrm share/evolution/2.22/default/pt
+@dirrm share/evolution/2.22/default/pl/mail/local
+@dirrm share/evolution/2.22/default/pl/mail
+@dirrm share/evolution/2.22/default/pl
+@dirrm share/evolution/2.22/default/nl/mail/local
+@dirrm share/evolution/2.22/default/nl/mail
+@dirrm share/evolution/2.22/default/nl
+@dirrm share/evolution/2.22/default/mk/mail/local
+@dirrm share/evolution/2.22/default/mk/mail
+@dirrm share/evolution/2.22/default/mk
+@dirrm share/evolution/2.22/default/lt/mail/local
+@dirrm share/evolution/2.22/default/lt/mail
+@dirrm share/evolution/2.22/default/lt
+@dirrm share/evolution/2.22/default/ko/mail/local
+@dirrm share/evolution/2.22/default/ko/mail
+@dirrm share/evolution/2.22/default/ko
+@dirrm share/evolution/2.22/default/ja/mail/local
+@dirrm share/evolution/2.22/default/ja/mail
+@dirrm share/evolution/2.22/default/ja
+@dirrm share/evolution/2.22/default/fr/mail/local
+@dirrm share/evolution/2.22/default/fr/mail
+@dirrm share/evolution/2.22/default/fr
+@dirrm share/evolution/2.22/default/fi/mail/local
+@dirrm share/evolution/2.22/default/fi/mail
+@dirrm share/evolution/2.22/default/fi
+@dirrm share/evolution/2.22/default/es/mail/local
+@dirrm share/evolution/2.22/default/es/mail
+@dirrm share/evolution/2.22/default/es
+@dirrm share/evolution/2.22/default/de/mail/local
+@dirrm share/evolution/2.22/default/de/mail
+@dirrm share/evolution/2.22/default/de
+@dirrm share/evolution/2.22/default/C/mail/local
+@dirrm share/evolution/2.22/default/C/mail
+@dirrm share/evolution/2.22/default/C
+@dirrm share/evolution/2.22/default
+@dirrm share/evolution/2.22
 @dirrm share/evolution
 @comment in xdg-dirs: @dirrm share/applications
-@dirrm libexec/evolution/2.12
+@dirrm libexec/evolution/2.22
 @dirrm libexec/evolution
-@dirrm lib/evolution/2.12/plugins
-@dirrm lib/evolution/2.12/components
-@dirrm lib/evolution/2.12
+@dirrm lib/evolution/2.22/plugins
+@dirrm lib/evolution/2.22/components
+@dirrm lib/evolution/2.22
 @dirrm lib/evolution
 @comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/evolution-2.12/text
-@dirrm include/evolution-2.12/table
-@dirrm include/evolution-2.12/shell
-@dirrm include/evolution-2.12/misc
-@dirrm include/evolution-2.12/menus
-@dirrm include/evolution-2.12/mail
-@dirrm include/evolution-2.12/e-util
-@dirrm include/evolution-2.12/e-conduit
-@dirrm include/evolution-2.12/calendar/gui
-@dirrm include/evolution-2.12/calendar
-@dirrm include/evolution-2.12/addressbook/gui/widgets
-@dirrm include/evolution-2.12/addressbook/gui
-@dirrm include/evolution-2.12/addressbook
-@dirrm include/evolution-2.12
+@dirrm include/evolution-2.22/text
+@dirrm include/evolution-2.22/table
+@dirrm include/evolution-2.22/shell
+@dirrm include/evolution-2.22/misc
+@dirrm include/evolution-2.22/menus
+@dirrm include/evolution-2.22/mail
+@dirrm include/evolution-2.22/e-util
+@dirrm include/evolution-2.22/e-conduit
+@dirrm include/evolution-2.22/calendar/gui
+@dirrm include/evolution-2.22/calendar
+@dirrm include/evolution-2.22/addressbook/gui/widgets
+@dirrm include/evolution-2.22/addressbook/gui
+@dirrm include/evolution-2.22/addressbook
+@dirrm include/evolution-2.22
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index ceddd924c5f..48431ec33a3 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.54 2008/03/06 14:20:30 drochner Exp $
+$NetBSD: distinfo,v 1.55 2008/04/15 18:42:53 drochner Exp $
 
-SHA1 (evolution-2.12.3.tar.bz2) = 14861dd497e935074424269f2d1e6c11be56abfe
-RMD160 (evolution-2.12.3.tar.bz2) = afe803833e213387fde3c180afc91bfc1e792262
-Size (evolution-2.12.3.tar.bz2) = 25938535 bytes
-SHA1 (patch-aa) = 6b7a9364a71ee8b9c8bd9084ceded06c7e384a7f
-SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
-SHA1 (patch-ac) = 000f7074415772aebc9137277ba45aef6b75ae25
+SHA1 (evolution-2.22.1.tar.bz2) = e9014dee660c7a34aeabd9cb1902394b954eb7ec
+RMD160 (evolution-2.22.1.tar.bz2) = 45c75971c2bbc91d3bb0cbc6be96d67c76d9c6ab
+Size (evolution-2.22.1.tar.bz2) = 30951821 bytes
+SHA1 (patch-aa) = d490839edcbb4893086750e052ca41bfff487bfa
+SHA1 (patch-ab) = b56533feb1bf7d3c3eabf905a50a54e7f27f5b1c
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
index 8e69c3828a0..fe039ffa01b 100644
--- a/mail/evolution/patches/patch-aa
+++ b/mail/evolution/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.24 2007/11/03 21:55:00 drochner Exp $
+$NetBSD: patch-aa,v 1.25 2008/04/15 18:42:53 drochner Exp $
 
---- ./widgets/e-timezone-dialog/e-timezone-dialog.c.orig	2007-10-12 09:03:43.000000000 +0200
+--- ./widgets/e-timezone-dialog/e-timezone-dialog.c.orig	2008-02-25 04:47:39.000000000 +0100
 +++ ./widgets/e-timezone-dialog/e-timezone-dialog.c
-@@ -82,8 +82,6 @@ struct _ETimezoneDialogPrivate {
+@@ -84,8 +84,6 @@ struct _ETimezoneDialogPrivate {
  
  #ifndef G_OS_WIN32 /* Declared properly in time.h already */
  extern char *tzname[2];
@@ -11,15 +11,15 @@ $NetBSD: patch-aa,v 1.24 2007/11/03 21:55:00 drochner Exp $
  #endif
  
  static void e_timezone_dialog_class_init	(ETimezoneDialogClass *class);
-@@ -304,7 +302,6 @@ e_timezone_dialog_construct (ETimezoneDi
+@@ -336,7 +334,6 @@ e_timezone_dialog_construct (ETimezoneDi
  	return NULL;
  }
  
 -#if 0
  static int
- get_local_offset ()
+ get_local_offset (void)
  {
-@@ -317,10 +314,11 @@ get_local_offset ()
+@@ -349,10 +346,11 @@ get_local_offset (void)
  	t_gmt = mktime (&gmt);
  	t_local = mktime (&local);
  	diff = t_local - t_gmt;
@@ -30,11 +30,11 @@ $NetBSD: patch-aa,v 1.24 2007/11/03 21:55:00 drochner Exp $
  }
 -#endif
  
- static const icaltimezone*
- get_local_timezone()
-@@ -328,7 +326,7 @@ get_local_timezone()
+ static icaltimezone*
+ get_local_timezone(void)
+@@ -360,7 +358,7 @@ get_local_timezone(void)
  	icaltimezone *zone;
- 	
+ 
  	tzset();
 -	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
 +	zone =  icaltimezone_get_builtin_timezone_from_offset (-get_local_offset(), tzname[0]);
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
index f3c8eb91643..da035dc30bb 100644
--- a/mail/evolution/patches/patch-ab
+++ b/mail/evolution/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.9 2004/10/29 14:57:15 jmmv Exp $
+$NetBSD: patch-ab,v 1.10 2008/04/15 18:42:53 drochner Exp $
 
---- ./mail/em-migrate.c.orig	2004-10-11 17:24:34.000000000 +0200
+--- ./mail/em-migrate.c.orig	2007-12-15 16:58:56.000000000 +0100
 +++ ./mail/em-migrate.c
-@@ -1447,7 +1447,7 @@ cp (const char *src, const char *dest, g
+@@ -1493,7 +1493,7 @@ cp (const char *src, const char *dest, g
  	ut.actime = st.st_atime;
  	ut.modtime = st.st_mtime;
  	utime (dest, &ut);
 -	chmod (dest, st.st_mode);
 +	chmod (dest, st.st_mode | S_IWUSR);
- 	
+ 
  	return 0;
- 	
+ 
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
deleted file mode 100644
index 05e0c9313c0..00000000000
--- a/mail/evolution/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.16 2008/03/06 14:20:30 drochner Exp $
-
---- mail/em-format.c.orig	2007-10-12 08:56:01.000000000 +0200
-+++ mail/em-format.c
-@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf
- 	opart = camel_mime_part_new();
- 	valid = camel_cipher_decrypt(context, part, opart, ex);
- 	if (valid == NULL) {
--		em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
-+		em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
- 		em_format_part_as(emf, stream, part, NULL);
- 	} else {
- 		if (emfc == NULL)
-@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C
- 	if (valid == NULL) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_part_as(emf, stream, part, "multipart/mixed");
- 	} else {
- 		if (emfc == NULL)
-@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came
- 		if (valid == NULL) {
- 			em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 			if (ex->desc)
--				em_format_format_error(emf, stream, ex->desc);
-+				em_format_format_error(emf, stream, "%s", ex->desc);
- 			em_format_part_as(emf, stream, part, "multipart/mixed");
- 		} else {
- 			if (emfc == NULL)
-@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);
-@@ -1657,7 +1657,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);