From 8d51b3e7c705600c15f8fa99b6472675025e39a3 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Tue, 3 Apr 2007 19:51:14 +0000
Subject: [PATCH] - Revise patch for GNOME bug #419524 to fix RH bug #235082
 (crash in     initial account setup wizard).

---
 evolution-2.10.0-use-glib-i18n.patch | 603 ++++++++++++++-------------
 evolution.spec                       |   6 +-
 2 files changed, 307 insertions(+), 302 deletions(-)

diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch
index e14f818..191cb34 100644
--- a/evolution-2.10.0-use-glib-i18n.patch
+++ b/evolution-2.10.0-use-glib-i18n.patch
@@ -1,5 +1,5 @@
 --- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/message-tag-followup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/message-tag-followup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -52,7 +52,7 @@
  #include <gconf/gconf-client.h>
  
@@ -10,7 +10,7 @@
  #include "e-util/e-icon-factory.h"
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/mail/em-popup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #include <libgnome/gnome-url.h>
  #include <libgnomevfs/gnome-vfs-mime.h>
@@ -20,8 +20,8 @@
  
  #include "em-popup.h"
  #include "libedataserver/e-msgport.h"
---- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-composer-utils.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-composer-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <libedataserver/e-data-server-util.h>
@@ -32,7 +32,7 @@
  #include "mail-mt.h"
  #include "mail-ops.h"
 --- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-account-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-account-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -64,7 +64,7 @@
  #include <gtk/gtkcombobox.h>
  #include <gtk/gtktable.h>
@@ -43,7 +43,7 @@
  #include <libgnomeui/gnome-druid-page-standard.h>
  
 --- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-tools.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/mail-tools.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
@@ -54,7 +54,7 @@
  #include <camel/camel-file-utils.h>
  #include <camel/camel-mime-message.h>
 --- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-selection-button.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-selection-button.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtkhbox.h>
  
@@ -65,7 +65,7 @@
  #include "mail-component.h"
  #include "em-folder-tree.h"
 --- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-hook.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format-hook.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -76,7 +76,7 @@
  
  /* class name -> klass map for EMFormat and subclasses */
 --- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-quote.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format-quote.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-url.h>
  
@@ -86,9 +86,9 @@
  
  #include "em-stripsig-filter.h"
  #include "em-format-quote.h"
---- evolution-2.10.0/mail/em-utils.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-utils.c	2007-03-18 08:26:55.000000000 -0400
-@@ -59,7 +55,7 @@
+--- evolution-2.10.0/mail/em-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-utils.c	2007-04-03 15:07:43.000000000 -0400
+@@ -59,7 +59,7 @@
  #include <libgnomevfs/gnome-vfs-mime.h>
  #include <libgnomevfs/gnome-vfs-mime-utils.h>
  #include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -98,7 +98,7 @@
  #include "mail-component.h"
  #include "mail-mt.h"
 --- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-rule.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-rule.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -108,8 +108,8 @@
  
  #include "em-filter-rule.h"
  #include "em-filter-context.h"
---- evolution-2.10.0/mail/mail-component.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-component.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-component.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-component.c	2007-04-03 15:07:43.000000000 -0400
 @@ -78,7 +78,7 @@
  
  #include <table/e-tree.h>
@@ -119,8 +119,8 @@
  
  #include <camel/camel-file-utils.h>
  #include <camel/camel-vtrash-folder.h>
---- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/importers/mail-importer.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/importers/mail-importer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include <gmodule.h>
@@ -130,8 +130,8 @@
  #include <camel/camel-folder.h>
  #include <camel/camel-store.h>
  #include <camel/camel-mime-message.h>
---- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-send-recv.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-send-recv.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <gtk/gtkbox.h>
  #include <gtk/gtkscrolledwindow.h>
@@ -141,8 +141,8 @@
  
  #include "e-util/e-gtk-utils.h"
  #include "libedataserver/e-account-list.h"
---- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-format-html.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-format-html.c	2007-04-03 15:07:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -153,7 +153,7 @@
  #include <camel/camel-mime-message.h>
  #include <camel/camel-stream.h>
 --- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-folder-element.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-folder-element.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -163,8 +163,8 @@
  
  #include "em-filter-folder-element.h"
  #include "mail/em-folder-selection-button.h"
---- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-folder-tree.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-tree.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <glib/gi18n.h>
  #include <gtk/gtk.h>
@@ -175,7 +175,7 @@
  #include <camel/camel-session.h>
  #include <camel/camel-store.h>
 --- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -186,7 +186,7 @@
  #include "e-util/e-util-private.h"
  
 --- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-tree-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-tree-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  
  #include <e-util/e-mktemp.h>
@@ -196,8 +196,8 @@
  
  #include <camel/camel-file-utils.h>
  
---- evolution-2.10.0/mail/message-list.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/message-list.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/message-list.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/message-list.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include <gtk/gtk.h>
@@ -207,8 +207,8 @@
  
  #include <camel/camel-exception.h>
  #include <camel/camel-file-utils.h>
---- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-folder-properties.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-properties.c	2007-04-03 15:07:43.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <camel/camel-folder.h>
  #include <camel/camel-vtrash-folder.h>
@@ -218,8 +218,8 @@
  
  #include "em-folder-properties.h"
  #include "em-config.h"
---- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-ops.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-ops.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <glib/gstdio.h>
  
@@ -230,7 +230,7 @@
  #include <camel/camel-mime-filter-from.h>
  #include <camel/camel-stream-filter.h>
 --- evolution-2.10.0/mail/em-migrate.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-migrate.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-migrate.c	2007-04-03 15:08:31.000000000 -0400
 @@ -54,7 +54,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -240,7 +240,7 @@
  
  #include <e-util/e-util.h>
  #include <libedataserver/e-data-server-util.h>
-@@ -2645,38 +2645,33 @@
+@@ -2645,38 +2645,34 @@
  {
  	GDir *dir;
  	const char *d;
@@ -282,10 +282,11 @@
 +	while (*language_names != NULL) {
 +		local = g_build_filename (
 +			EVOLUTION_PRIVDATADIR, "default",
-+			*language_names++, "mail", "local", NULL);
++			*language_names, "mail", "local", NULL);
 +		if (g_file_test (local, G_FILE_TEST_EXISTS))
 +			break;
 +		g_free (local);
++		language_names++;
 +	}
 +
 +	/* Make sure we found one. */
@@ -293,8 +294,8 @@
  
  	dir = g_dir_open(local, 0, NULL);
  	if (dir) {
---- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-vfolder.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-vfolder.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  
  #include <glib.h>
@@ -305,7 +306,7 @@
  #include <camel/camel-vee-folder.h>
  #include <camel/camel-vee-store.h>
 --- evolution-2.10.0/mail/em-folder-selector.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-selector.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-selector.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <string.h>
@@ -315,8 +316,8 @@
  
  #include <e-util/e-util.h>
  #include <misc/e-gui-utils.h>
---- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-subscribe-editor.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-subscribe-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -44,7 +44,7 @@
  #include "mail-config.h"
  
@@ -327,7 +328,7 @@
  #include <gtk/gtkdialog.h>
  #include <gtk/gtkscrolledwindow.h>
 --- evolution-2.10.0/mail/mail-autofilter.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-autofilter.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/mail-autofilter.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <string.h>
  
@@ -338,7 +339,7 @@
  #include <libgnomeui/gnome-app-helper.h>
  #include <libgnomeui/gnome-popup-menu.h>
 --- evolution-2.10.0/mail/em-format-html-display.c.use-glib-i18n	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-html-display.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format-html-display.c	2007-04-03 15:07:43.000000000 -0400
 @@ -67,7 +67,7 @@
  #include <glade/glade.h>
  
@@ -349,7 +350,7 @@
  #include <bonobo/bonobo-control-frame.h>
  #include <bonobo/bonobo-stream-memory.h>
 --- evolution-2.10.0/mail/em-account-prefs.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-account-prefs.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-account-prefs.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtkcellrenderertoggle.h>
  #include <gtk/gtkcellrenderertext.h>
@@ -359,8 +360,8 @@
  
  #include "mail-component.h"
  #include "mail-config.h"
---- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-folder-cache.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-folder-cache.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <glib/gstdio.h>
  
@@ -371,7 +372,7 @@
  #include <camel/camel-store.h>
  #include <camel/camel-folder.h>
 --- evolution-2.10.0/mail/em-format.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <libgnomevfs/gnome-vfs-mime.h>
  #include <libgnomevfs/gnome-vfs-mime-utils.h>
@@ -382,7 +383,7 @@
  #include <libedataserver/e-msgport.h>
  #include <camel/camel-url.h>
 --- evolution-2.10.0/mail/em-vfolder-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-vfolder-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-vfolder-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -392,8 +393,8 @@
  
  #include "e-util/e-util-private.h"
  
---- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-mt.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-mt.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <glib.h>
  
@@ -401,10 +402,10 @@
 -#include <libgnome/gnome-i18n.h>
 +#include <glib/gi18n.h>
  
- #include <libedataserver/e-msgport.h>
  #include <libedataserver/e-data-server-util.h>
---- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-folder-utils.c	2007-03-18 08:26:55.000000000 -0400
+ 
+--- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  
  #include <gtk/gtk.h>
@@ -415,7 +416,7 @@
  #include <camel/camel-session.h>
  #include <camel/camel-store.h>
 --- evolution-2.10.0/mail/em-vfolder-rule.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-vfolder-rule.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-vfolder-rule.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  
  #include <gtk/gtk.h>
@@ -426,7 +427,7 @@
  #include "camel/camel-url.h"
  #include "em-vfolder-context.h"
 --- evolution-2.10.0/a11y/widgets/ea-calendar-item.c.use-glib-i18n	2007-01-03 10:34:56.000000000 -0500
-+++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <libgnomecanvas/gnome-canvas.h>
  #include <glib/gdate.h>
@@ -437,7 +438,7 @@
  #include "ea-calendar-item.h"
  #include "ea-calendar-cell.h"
 --- evolution-2.10.0/a11y/addressbook/ea-minicard-view.c.use-glib-i18n	2007-01-03 10:34:56.000000000 -0500
-+++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -20,11 +20,10 @@
   */
  
@@ -452,7 +453,7 @@
  #include "ea-minicard-view.h"
  #include "eab-gui-util.h"
 --- evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n	2007-01-03 10:34:56.000000000 -0500
-+++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -22,7 +22,7 @@
  
  #include <config.h>
@@ -463,7 +464,7 @@
  
  static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible);
 --- evolution-2.10.0/a11y/addressbook/ea-minicard.c.use-glib-i18n	2007-01-03 10:34:56.000000000 -0500
-+++ evolution-2.10.0/a11y/addressbook/ea-minicard.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/addressbook/ea-minicard.c	2007-04-03 15:07:43.000000000 -0400
 @@ -22,7 +22,7 @@
  
  #include <config.h>
@@ -474,7 +475,7 @@
  #include "ea-minicard-view.h"
  #include "e-minicard.h"
 --- evolution-2.10.0/a11y/calendar/ea-day-view.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-day-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-day-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include "ea-gnome-calendar.h"
  #include "calendar-commands.h"
@@ -485,7 +486,7 @@
  static void ea_day_view_class_init (EaDayViewClass *klass);
  
 --- evolution-2.10.0/a11y/calendar/ea-jump-button.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-jump-button.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-jump-button.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include "ea-week-view.h"
  #include "e-week-view.h"
@@ -496,7 +497,7 @@
  static void ea_jump_button_class_init (EaJumpButtonClass *klass);
  
 --- evolution-2.10.0/a11y/calendar/ea-cal-view-event.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include "ea-day-view.h"
  #include "ea-week-view.h"
@@ -507,7 +508,7 @@
  static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
  static void ea_cal_view_event_init (EaCalViewEvent *a11y);
 --- evolution-2.10.0/a11y/calendar/ea-week-view.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-week-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-week-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include "ea-gnome-calendar.h"
  #include "calendar-commands.h"
@@ -518,7 +519,7 @@
  static void ea_week_view_class_init (EaWeekViewClass *klass);
  
 --- evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include "ea-week-view.h"
  #include "ea-week-view-cell.h"
@@ -529,7 +530,7 @@
  /* EaWeekViewMainItem */
  static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass);
 --- evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include "ea-day-view.h"
  #include "ea-day-view-cell.h"
@@ -540,7 +541,7 @@
  /* EaDayViewMainItem */
  static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
 --- evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtknotebook.h>
  #include <libecal/e-cal-time-util.h>
@@ -551,7 +552,7 @@
  static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
  
 --- evolution-2.10.0/a11y/calendar/ea-cal-view.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/calendar/ea-cal-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/calendar/ea-cal-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include "calendar-commands.h"
  #include "goto.h"
@@ -562,7 +563,7 @@
  static void ea_cal_view_class_init (EaCalViewClass *klass);
  
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include "a11y/gal-a11y-util.h"
@@ -573,7 +574,7 @@
  #include "gal-a11y-e-cell-popup.h"
  #include "gal-a11y-e-cell-registry.h"
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c	2007-04-03 15:07:43.000000000 -0400
 @@ -15,7 +15,7 @@
  #include "a11y/gal-a11y-util.h"
  #include "table/e-table.h"
@@ -584,7 +585,7 @@
  #include "gal-a11y-e-cell.h"
  #include "gal-a11y-e-cell-vbox.h"
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c	2007-04-03 15:07:43.000000000 -0400
 @@ -2,7 +2,7 @@
  
  #include "table/e-cell-toggle.h"
@@ -595,7 +596,7 @@
  #include "gal-a11y-e-cell-toggle.h"
  
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c	2007-04-03 15:07:43.000000000 -0400
 @@ -14,7 +14,7 @@
  
  #include "a11y/gal-a11y-util.h"
@@ -606,7 +607,7 @@
  #include "gal-a11y-e-cell-text.h"
  
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n	2007-03-08 01:11:21.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c	2007-04-03 15:07:43.000000000 -0400
 @@ -14,7 +14,7 @@
  #include "table/e-cell-tree.h"
  #include "table/e-table.h"
@@ -617,7 +618,7 @@
  #include "gal-a11y-e-cell-tree.h"
  #include "gal-a11y-e-cell-registry.h"
 --- evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n	2007-01-03 10:34:57.000000000 -0500
-+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c	2007-04-03 15:07:43.000000000 -0400
 @@ -13,7 +13,7 @@
  #include "table/e-table-click-to-add.h"
  #include "table/e-table-group.h"
@@ -628,7 +629,7 @@
  #include "gal-a11y-e-table-click-to-add.h"
  #include "gal-a11y-e-table-click-to-add-factory.h"
 --- evolution-2.10.0/filter/rule-editor.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/rule-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/rule-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -639,7 +640,7 @@
  #include "e-util/e-error.h"
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/filter/filter-label.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/filter-label.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-label.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtk.h>
  #include <gconf/gconf.h>
@@ -650,7 +651,7 @@
  #include <libgnomeui/gnome-dialog-util.h>
  #include <libgnomeui/gnome-file-entry.h>
 --- evolution-2.10.0/filter/filter-part.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/filter-part.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-part.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <gtk/gtkbox.h>
@@ -660,8 +661,8 @@
  
  #include "filter-part.h"
  #include "rule-context.h"
---- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/filter/filter-datespec.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/filter/filter-datespec.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <math.h>
  
@@ -672,7 +673,7 @@
  
  #include "filter-datespec.h"
 --- evolution-2.10.0/filter/rule-context.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/rule-context.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/rule-context.c	2007-04-03 15:07:43.000000000 -0400
 @@ -34,7 +34,7 @@
  
  #include <gtk/gtk.h>
@@ -683,7 +684,7 @@
  #include <libedataserver/e-xml-hash-utils.h>
  #include <libedataserver/e-xml-utils.h>
 --- evolution-2.10.0/filter/filter-option.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/filter-option.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-option.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <string.h>
  
@@ -694,7 +695,7 @@
  #include "filter-option.h"
  #include "filter-part.h"
 --- evolution-2.10.0/filter/filter-file.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/filter-file.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-file.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <gtk/gtk.h>
@@ -705,7 +706,7 @@
  
  #include <libedataserver/e-sexp.h>
 --- evolution-2.10.0/filter/filter-input.c.use-glib-i18n	2007-01-03 10:34:13.000000000 -0500
-+++ evolution-2.10.0/filter/filter-input.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-input.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <regex.h>
  
@@ -716,7 +717,7 @@
  #include "filter-input.h"
  #include "libedataserver/e-sexp.h"
 --- evolution-2.10.0/filter/filter-rule.c.use-glib-i18n	2007-02-26 05:00:00.000000000 -0500
-+++ evolution-2.10.0/filter/filter-rule.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/filter/filter-rule.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -727,7 +728,7 @@
  #include "e-util/e-error.h"
  #include "filter-rule.h"
 --- evolution-2.10.0/widgets/misc/e-calendar-item.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-calendar-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-calendar-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -43,7 +43,7 @@
  #include <gtk/gtklabel.h>
  #include <gtk/gtksignal.h>
@@ -738,7 +739,7 @@
  #include <e-util/e-util.h>
  
 --- evolution-2.10.0/widgets/misc/e-unicode.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-unicode.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-unicode.c	2007-04-03 15:07:43.000000000 -0400
 @@ -42,7 +42,7 @@
  
  #include <libedataserver/e-iconv.h>
@@ -749,7 +750,7 @@
  
  #define d(x) x
 --- evolution-2.10.0/widgets/misc/e-task-widget.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-task-widget.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-task-widget.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <gtk/gtkimage.h>
  #include <gtk/gtktooltips.h>
@@ -760,7 +761,7 @@
  
  #define SPACING 2
 --- evolution-2.10.0/widgets/misc/e-filter-bar.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-filter-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-filter-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libxml/tree.h>
  #include <libxml/parser.h>
@@ -771,7 +772,7 @@
  #include "e-dropdown-button.h"
  #include "e-filter-bar.h"
 --- evolution-2.10.0/widgets/misc/e-dateedit.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-dateedit.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-dateedit.c	2007-04-03 15:07:43.000000000 -0400
 @@ -58,7 +58,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <atk/atkrelation.h>
@@ -782,7 +783,7 @@
  #include <libedataserver/e-data-server-util.h>
  #include <e-util/e-util.h>
 --- evolution-2.10.0/widgets/misc/e-charset-picker.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-charset-picker.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-charset-picker.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gtk/gtkoptionmenu.h>
  #include <gtk/gtksignal.h>
@@ -793,7 +794,7 @@
  #include <bonobo/bonobo-ui-node.h>
  #include <bonobo/bonobo-ui-util.h>
 --- evolution-2.10.0/widgets/misc/e-clipped-label.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-clipped-label.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-clipped-label.c	2007-04-03 15:07:43.000000000 -0400
 @@ -40,7 +40,7 @@
  
  #include <glib.h>
@@ -804,7 +805,7 @@
  
  static void e_clipped_label_class_init (EClippedLabelClass *class);
 --- evolution-2.10.0/widgets/misc/e-cell-percent.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-cell-percent.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-cell-percent.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <unistd.h>
  #include <stdio.h>
@@ -815,7 +816,7 @@
  #include "e-cell-percent.h"
  
 --- evolution-2.10.0/widgets/misc/e-cell-date-edit.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c	2007-04-03 15:07:43.000000000 -0400
 @@ -44,7 +44,7 @@
  #include <table/e-cell-text.h>
  
@@ -826,7 +827,7 @@
  #include <libedataserver/e-time-utils.h>
  
 --- evolution-2.10.0/widgets/misc/e-map.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-map.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-map.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <gtk/gtksignal.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -837,7 +838,7 @@
  #include "e-util/e-util-private.h"
  #include "e-util/e-util.h"
 --- evolution-2.10.0/widgets/misc/e-canvas-background.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-canvas-background.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-canvas-background.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
@@ -848,7 +849,7 @@
  #include "misc/e-canvas.h"
  #include "misc/e-canvas-utils.h"
 --- evolution-2.10.0/widgets/misc/e-selection-model.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-selection-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-selection-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  
  #include <gdk/gdkkeysyms.h>
@@ -859,7 +860,7 @@
  #include "e-util/e-util.h"
  
 --- evolution-2.10.0/widgets/misc/e-selection-model-array.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-selection-model-array.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-selection-model-array.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  
  #include <gtk/gtk.h>
@@ -870,7 +871,7 @@
  
  #include "e-selection-model-array.h"
 --- evolution-2.10.0/widgets/misc/e-send-options.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-send-options.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-send-options.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtk.h>
@@ -881,7 +882,7 @@
  #include <time.h>
  
 --- evolution-2.10.0/widgets/misc/e-calendar.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-calendar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-calendar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -43,7 +43,7 @@
  #include <gtk/gtkpixmap.h>
  #include <gtk/gtksignal.h>
@@ -892,7 +893,7 @@
  #define E_CALENDAR_SMALL_FONT_PTSIZE 6
  
 --- evolution-2.10.0/widgets/misc/e-reflow.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-reflow.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-reflow.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gtk/gtk.h>
  
@@ -903,7 +904,7 @@
  #include "e-util/e-util.h"
  #include "misc/e-unicode.h"
 --- evolution-2.10.0/widgets/misc/e-search-bar.c.use-glib-i18n	2007-01-08 07:23:31.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-search-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-search-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -42,7 +42,7 @@
  #include <misc/e-unicode.h>
  #include <misc/e-gui-utils.h>
@@ -914,7 +915,7 @@
  #include <bonobo/bonobo-ui-util.h>
  
 --- evolution-2.10.0/widgets/misc/e-attachment-bar.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-attachment-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-attachment-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gconf/gconf-client.h>
  #include <gdk/gdkkeysyms.h>
@@ -925,7 +926,7 @@
  
  #include "e-attachment.h"
 --- evolution-2.10.0/widgets/misc/e-attachment.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-attachment.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-attachment.c	2007-04-03 15:07:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkdialog.h>
@@ -936,7 +937,7 @@
  
  #include "e-util/e-mktemp.h"
 --- evolution-2.10.0/widgets/misc/e-canvas-vbox.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
@@ -947,7 +948,7 @@
  
  #include "e-canvas.h"
 --- evolution-2.10.0/widgets/misc/e-activity-handler.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-activity-handler.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-activity-handler.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtksignal.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -958,7 +959,7 @@
  
  #include <misc/e-popup-menu.h>
 --- evolution-2.10.0/widgets/misc/e-image-chooser.c.use-glib-i18n	2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-image-chooser.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/misc/e-image-chooser.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gtk/gtkdnd.h>
  
@@ -969,7 +970,7 @@
  #include "e-image-chooser.h"
  #include "e-util/e-util-marshal.h"
 --- evolution-2.10.0/widgets/menus/gal-view-new-dialog.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtk.h>
  
@@ -989,7 +990,7 @@
  	dialog->gui = gui;
  
 --- evolution-2.10.0/widgets/menus/gal-view-factory-etable.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  
  #include <config.h>
@@ -1000,7 +1001,7 @@
  
  #include "gal-view-etable.h"
 --- evolution-2.10.0/widgets/menus/gal-define-views-model.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-define-views-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-define-views-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -1011,7 +1012,7 @@
  
  #include "gal-define-views-model.h"
 --- evolution-2.10.0/widgets/menus/gal-define-views-dialog.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtk.h>
  
@@ -1040,7 +1041,7 @@
  	dialog->gui = gui;
  
 --- evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtk.h>
  
@@ -1069,7 +1070,7 @@
               "<ETableState> <column source=\"0\"/> <grouping> </grouping> </ETableState>" \
  	     "</ETableSpecification>"
 --- evolution-2.10.0/widgets/menus/gal-view-instance.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-instance.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-instance.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <libedataserver/e-xml-utils.h>
  #include <libedataserver/e-data-server-util.h>
@@ -1080,7 +1081,7 @@
  #include "e-util/e-xml-utils.h"
  #include "misc/e-unicode.h"
 --- evolution-2.10.0/widgets/menus/gal-view-collection.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-collection.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-collection.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libgnome/gnome-util.h>
  #include <libedataserver/e-xml-utils.h>
@@ -1091,7 +1092,7 @@
  #include "e-util/e-xml-utils.h"
  #include "misc/e-unicode.h"
 --- evolution-2.10.0/widgets/menus/gal-view-menus.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/menus/gal-view-menus.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/menus/gal-view-menus.c	2007-04-03 15:07:43.000000000 -0400
 @@ -20,7 +20,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -1102,7 +1103,7 @@
  #include <e-util/e-util.h>
  #include <e-util/e-xml-utils.h>
 --- evolution-2.10.0/widgets/table/e-cell-pixbuf.c.use-glib-i18n	2007-03-08 01:11:20.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <libgnomecanvas/gnome-canvas.h>
@@ -1113,7 +1114,7 @@
  #include "e-cell-pixbuf.h"
  
 --- evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  
  #include <gtk/gtk.h>
@@ -1124,7 +1125,7 @@
  
  #include "e-table-field-chooser-dialog.h"
 --- evolution-2.10.0/widgets/table/e-table-sorter.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-sorter.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-sorter.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -1135,7 +1136,7 @@
  
  #include "e-table-sorter.h"
 --- evolution-2.10.0/widgets/table/e-table-selection-model.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-selection-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-selection-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gdk/gdkkeysyms.h>
@@ -1146,7 +1147,7 @@
  
  #include "e-table-selection-model.h"
 --- evolution-2.10.0/widgets/table/e-table-group-leaf.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-group-leaf.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-group-leaf.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtk.h>
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
@@ -1157,7 +1158,7 @@
  #include "misc/e-canvas.h"
  
 --- evolution-2.10.0/widgets/table/e-table-field-chooser.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-field-chooser.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-field-chooser.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtk.h>
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
@@ -1177,7 +1178,7 @@
  	etfc->gui = gui;
  
 --- evolution-2.10.0/widgets/table/e-table-item.c.use-glib-i18n	2007-01-23 03:23:43.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include "a11y/e-table/gal-a11y-e-table-item-factory.h"
@@ -1188,7 +1189,7 @@
  #include "misc/e-canvas.h"
  #include "misc/e-canvas-utils.h"
 --- evolution-2.10.0/widgets/table/e-table.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  
@@ -1199,7 +1200,7 @@
  #include "misc/e-canvas.h"
  #include "misc/e-canvas-background.h"
 --- evolution-2.10.0/widgets/table/e-table-group-container.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-group-container.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-group-container.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  
@@ -1210,7 +1211,7 @@
  #include "misc/e-canvas-utils.h"
  #include "misc/e-canvas.h"
 --- evolution-2.10.0/widgets/table/e-cell-float.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-cell-float.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-float.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <sys/time.h>
  #include <unistd.h>
@@ -1221,7 +1222,7 @@
  
  #include "e-cell-float.h"
 --- evolution-2.10.0/widgets/table/e-tree-scrolled.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-tree-scrolled.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-tree-scrolled.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -1232,7 +1233,7 @@
  
  #include "e-tree-scrolled.h"
 --- evolution-2.10.0/widgets/table/e-table-col.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-col.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-col.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  
  #include <config.h>
@@ -1243,7 +1244,7 @@
  
  #include "e-table-col.h"
 --- evolution-2.10.0/widgets/table/e-table-scrolled.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-scrolled.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-scrolled.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -1254,7 +1255,7 @@
  #include "e-table.h"
  #include "e-table-scrolled.h"
 --- evolution-2.10.0/widgets/table/e-table-header-item.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-header-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-header-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gdk-pixbuf/gdk-pixbuf.h>
  #include <gdk/gdkkeysyms.h>
@@ -1283,7 +1284,7 @@
  			gtk_object_sink (GTK_OBJECT (popup));
  			g_signal_connect (popup, "selection-done",
 --- evolution-2.10.0/widgets/table/e-table-field-chooser-item.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -1294,7 +1295,7 @@
  #include "e-util/e-xml-utils.h"
  #include "misc/e-canvas.h"
 --- evolution-2.10.0/widgets/table/e-table-config.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-config.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-config.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <libgnomeui/gnome-propertybox.h>
  #include <glade/glade.h>
@@ -1330,8 +1331,8 @@
  		g_free (filename);
  	}
  
---- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/widgets/table/e-cell-text.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-text.c	2007-04-03 15:07:43.000000000 -0400
 @@ -50,7 +50,7 @@
  #include "a11y/e-table/gal-a11y-e-cell-registry.h"
  #include "a11y/e-table/gal-a11y-e-cell-text.h"
@@ -1342,7 +1343,7 @@
  #include "e-util/e-text-event-processor-emacs-like.h"
  #include "e-util/e-util.h"
 --- evolution-2.10.0/widgets/table/e-tree.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-tree.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-tree.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  
@@ -1353,7 +1354,7 @@
  #include "e-util/e-util-marshal.h"
  #include "misc/e-canvas.h"
 --- evolution-2.10.0/widgets/table/e-cell-number.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-cell-number.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-number.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <sys/time.h>
  #include <unistd.h>
@@ -1364,7 +1365,7 @@
  
  #include "e-cell-number.h"
 --- evolution-2.10.0/widgets/table/e-tree-selection-model.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-tree-selection-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-tree-selection-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <config.h>
  
@@ -1375,7 +1376,7 @@
  
  #include "e-tree-selection-model.h"
 --- evolution-2.10.0/widgets/table/e-cell-combo.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-cell-combo.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-combo.c	2007-04-03 15:07:43.000000000 -0400
 @@ -59,7 +59,7 @@
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
@@ -1386,7 +1387,7 @@
  #include "misc/e-unicode.h"
  
 --- evolution-2.10.0/widgets/table/e-table-click-to-add.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-table-click-to-add.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-table-click-to-add.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include "a11y/e-table/gal-a11y-e-table-click-to-add.h"
@@ -1397,7 +1398,7 @@
  #include "e-util/e-util.h"
  #include "misc/e-canvas-utils.h"
 --- evolution-2.10.0/widgets/table/e-cell-date.c.use-glib-i18n	2007-01-03 10:34:45.000000000 -0500
-+++ evolution-2.10.0/widgets/table/e-cell-date.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/table/e-cell-date.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <unistd.h>
  #include <string.h>
@@ -1407,8 +1408,8 @@
  #include "e-util/e-util.h"
  #include "misc/e-unicode.h"
  
---- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/widgets/text/e-text.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/widgets/text/e-text.c	2007-04-03 15:07:43.000000000 -0400
 @@ -52,7 +52,7 @@
  #include "misc/e-canvas.h"
  #include "misc/e-canvas-utils.h"
@@ -1419,7 +1420,7 @@
  #include "e-util/e-util.h"
  
 --- evolution-2.10.0/widgets/text/e-completion-view.c.use-glib-i18n	2007-01-03 10:34:41.000000000 -0500
-+++ evolution-2.10.0/widgets/text/e-completion-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/text/e-completion-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include "table/e-table-scrolled.h"
@@ -1439,7 +1440,7 @@
  "         minimum_width=\"16\" resizable=\"true\" cell=\"string\" "
  "         compare=\"string\"/> "
 --- evolution-2.10.0/widgets/text/e-entry.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/widgets/text/e-entry.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/widgets/text/e-entry.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <libxml/parser.h>
  #include <libgnomecanvas/gnome-canvas.h>
@@ -1450,7 +1451,7 @@
  #include "misc/e-canvas.h"
  #include "misc/e-canvas-utils.h"
 --- evolution-2.10.0/plugins/calendar-file/calendar-file.c.use-glib-i18n	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/calendar-file/calendar-file.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/calendar-file/calendar-file.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <calendar/gui/e-cal-config.h>
  #include <libedataserver/e-source.h>
@@ -1460,8 +1461,8 @@
  #include <string.h>
  
  GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
---- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1472,7 +1473,7 @@
  #include <mail/em-popup.h>
  #include <mail/mail-ops.h>
 --- evolution-2.10.0/plugins/publish-calendar/publish-calendar.c.use-glib-i18n	2007-01-03 10:34:05.000000000 -0500
-+++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #include <gtk/gtk.h>
  #include <glade/glade.h>
@@ -1483,7 +1484,7 @@
  #include <libedataserverui/e-passwords.h>
  #include <calendar/gui/e-cal-popup.h>
 --- evolution-2.10.0/plugins/calendar-weather/calendar-weather.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <libedataserver/e-source.h>
  #include <libedataserver/e-url.h>
@@ -1494,7 +1495,7 @@
  #include <libxml/tree.h>
  #include <string.h>
 --- evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1505,7 +1506,7 @@
  #include <e-util/e-popup.h>
  #include <mail/em-popup.h>
 --- evolution-2.10.0/plugins/backup-restore/backup-restore.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/backup-restore/backup-restore.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/backup-restore/backup-restore.c	2007-04-03 15:07:43.000000000 -0400
 @@ -2,7 +2,7 @@
  #include <sys/types.h>
  #include <sys/wait.h>
@@ -1516,7 +1517,7 @@
  
  void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target);
 --- evolution-2.10.0/plugins/backup-restore/backup.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/backup-restore/backup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/backup-restore/backup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -8,7 +8,7 @@
  #include <string.h>
  #include <sys/wait.h>
@@ -1527,7 +1528,7 @@
  
  #define EVOLUTION "evolution-" BASE_VERSION
 --- evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n	2007-01-23 03:23:42.000000000 -0500
-+++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtk.h>
@@ -1538,7 +1539,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/plugins/default-source/default-source.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/default-source/default-source.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/default-source/default-source.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <libebook/e-book.h>
  #include <libecal/e-cal.h>
@@ -1549,7 +1550,7 @@
  GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data);
  void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
 --- evolution-2.10.0/plugins/subject-thread/subject-thread.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/subject-thread/subject-thread.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/subject-thread/subject-thread.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1560,7 +1561,7 @@
  #include <e-util/e-config.h>
  #include <mail/em-config.h>
 --- evolution-2.10.0/plugins/calendar-http/calendar-http.c.use-glib-i18n	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/calendar-http/calendar-http.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/calendar-http/calendar-http.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <calendar/gui/e-cal-config.h>
  #include <libedataserver/e-source.h>
@@ -1570,8 +1571,8 @@
  #include <string.h>
  
  GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data);
---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1581,8 +1582,8 @@
  #include <gconf/gconf-client.h>
  #include <camel/camel-stream.h>
  #include <camel/camel-stream-mem.h>
---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/itip-formatter/itip-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1592,8 +1593,8 @@
  #include <gconf/gconf-client.h>
  #include <camel/camel-stream.h>
  #include <camel/camel-stream-mem.h>
---- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  #include <glib.h>
@@ -1604,7 +1605,7 @@
  #include <mail/em-config.h>
  #include <mail/em-popup.h>
 --- evolution-2.10.0/plugins/groupwise-features/junk-settings.c.use-glib-i18n	2007-02-26 04:59:57.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gtk/gtkcellrenderertext.h>
  #include <libgnomeui/gnome-ui-init.h>
@@ -1615,7 +1616,7 @@
  #include <e-util/e-util-private.h>
  #include <e-gw-connection.h>
 --- evolution-2.10.0/plugins/groupwise-features/install-shared.c.use-glib-i18n	2007-02-26 04:59:57.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/install-shared.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/install-shared.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <gnome.h>
  #include <gtk/gtk.h>
@@ -1626,7 +1627,7 @@
  #include <e-util/e-config.h>
  #include <mail/em-config.h>
 --- evolution-2.10.0/plugins/groupwise-features/process-meeting.c.use-glib-i18n	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #endif
  
@@ -1637,7 +1638,7 @@
  #include <calendar/gui/e-cal-popup.h>
  #include <calendar/gui/e-calendar-view.h>
 --- evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <e-util/e-config.h>
  #include <addressbook/gui/widgets/eab-config.h>
@@ -1648,7 +1649,7 @@
  
  void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
 --- evolution-2.10.0/plugins/groupwise-features/send-options.c.use-glib-i18n	2007-02-26 04:59:57.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/send-options.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/plugins/groupwise-features/send-options.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #endif
  
@@ -1658,8 +1659,8 @@
  #include <glade/glade.h>
  #include <gtk/gtk.h>
  #include "mail/em-account-editor.h"
---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c	2007-04-03 15:07:43.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <e-util/e-xml-utils.h>
  
@@ -1669,8 +1670,8 @@
  #include <string.h>
  
  #include <libebook/e-book.h>
---- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/plugins/bbdb/bbdb.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/plugins/bbdb/bbdb.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #endif
  
@@ -1681,7 +1682,7 @@
  
  #include <libebook/e-book.h>
 --- evolution-2.10.0/e-util/e-categories-config.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-categories-config.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-categories-config.c	2007-04-03 15:07:43.000000000 -0400
 @@ -10,7 +10,7 @@
  
  #include <string.h>
@@ -1692,7 +1693,7 @@
  #include <libedataserver/e-categories.h>
  #include <libedataserverui/e-categories-dialog.h>
 --- evolution-2.10.0/e-util/e-text-event-processor.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-text-event-processor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-text-event-processor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,8 @@
  
  #include <config.h>
@@ -1704,7 +1705,7 @@
  #include "e-text-event-processor.h"
  #include "e-util.h"
 --- evolution-2.10.0/e-util/e-util.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-util.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-util.c	2007-04-03 15:07:43.000000000 -0400
 @@ -1112,20 +1112,6 @@
  	}
  }
@@ -1727,7 +1728,7 @@
  get_font_options ()
  {
 --- evolution-2.10.0/e-util/e-popup.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -42,7 +42,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -1738,7 +1739,7 @@
  #define d(x)
  
 --- evolution-2.10.0/e-util/e-xml-utils.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-xml-utils.c	2007-03-18 08:46:40.000000000 -0400
++++ evolution-2.10.0/e-util/e-xml-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,155 +36,14 @@
  #include <string.h>
  
@@ -1897,7 +1898,7 @@
  e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
  {
 --- evolution-2.10.0/e-util/e-config.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-config.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-config.c	2007-04-03 15:07:43.000000000 -0400
 @@ -45,7 +45,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -1908,7 +1909,7 @@
  #define d(x) 
  
 --- evolution-2.10.0/e-util/e-dialog-utils.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-dialog-utils.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-dialog-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <gtk/gtkstock.h>
  
@@ -1919,7 +1920,7 @@
  
  #include <libgnomevfs/gnome-vfs-utils.h>
 --- evolution-2.10.0/e-util/e-import.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-import.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-import.c	2007-04-03 15:07:43.000000000 -0400
 @@ -45,7 +45,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -1930,7 +1931,7 @@
  #define d(x) 
  
 --- evolution-2.10.0/e-util/Makefile.am.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/Makefile.am	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/Makefile.am	2007-04-03 15:07:43.000000000 -0400
 @@ -108,7 +108,6 @@
  	eggtrayicon.c				\
  	eggtrayicon.h				\
@@ -1940,7 +1941,7 @@
  	e-sorter-array.c			\
  	e-text-event-processor-emacs-like.c     \
 --- evolution-2.10.0/e-util/e-error.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-error.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-error.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gtk/gtkimage.h>
  #include <gtk/gtkscrolledwindow.h>
@@ -1951,7 +1952,7 @@
  
  #include <libedataserver/e-xml-utils.h>
 --- evolution-2.10.0/e-util/e-event.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-event.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-event.c	2007-04-03 15:07:43.000000000 -0400
 @@ -42,7 +42,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -1962,7 +1963,7 @@
  
  #define d(x)
 --- evolution-2.10.0/e-util/e-xml-utils.h.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-xml-utils.h	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-xml-utils.h	2007-04-03 15:07:43.000000000 -0400
 @@ -30,18 +30,6 @@
  
  G_BEGIN_DECLS
@@ -1983,7 +1984,7 @@
                                                        const xmlChar *prop_name);
  gint     e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,
 --- evolution-2.10.0/e-util/e-i18n.h.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-i18n.h	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-i18n.h	2007-04-03 15:07:43.000000000 -0400
 @@ -1,74 +0,0 @@
 -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 -/*
@@ -2060,7 +2061,7 @@
 -
 -#endif /* __E_I18N_H__ */
 --- evolution-2.10.0/e-util/e-menu.c.use-glib-i18n	2007-01-03 10:34:40.000000000 -0500
-+++ evolution-2.10.0/e-util/e-menu.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/e-util/e-menu.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <glib.h>
@@ -2071,7 +2072,7 @@
  
  #include <libedataserver/e-data-server-util.h>
 --- evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n	2007-01-03 10:32:48.000000000 -0500
-+++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c	2007-04-03 15:07:43.000000000 -0400
 @@ -22,7 +22,7 @@
  #include <config.h>
  #include "addressbook/printing/e-contact-print-envelope.h"
@@ -2082,7 +2083,7 @@
  #include <time.h>
  #include <libgnomeprintui/gnome-print-dialog.h>
 --- evolution-2.10.0/addressbook/printing/e-contact-print.c.use-glib-i18n	2007-03-08 01:10:56.000000000 -0500
-+++ evolution-2.10.0/addressbook/printing/e-contact-print.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/printing/e-contact-print.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <libxml/parser.h>
  #include <libxml/xmlmemory.h>
@@ -2093,7 +2094,7 @@
  #include <libgnomeprint/gnome-print.h>
  #include <libgnomeprint/gnome-print-unit.h>
 --- evolution-2.10.0/addressbook/gui/component/addressbook-config.c.use-glib-i18n	2007-01-03 10:32:46.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gtk/gtkcelllayout.h>
  #include <gtk/gtklabel.h>
@@ -2104,7 +2105,7 @@
  #include <bonobo/bonobo-generic-factory.h>
  
 --- evolution-2.10.0/addressbook/gui/component/addressbook.c.use-glib-i18n	2007-01-03 10:32:46.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/component/addressbook.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/component/addressbook.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  
@@ -2115,7 +2116,7 @@
  #include <libedataserver/e-url.h>
  #include <libedataserverui/e-passwords.h>
 --- evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n	2007-01-03 10:32:46.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  
  #include <libebook/e-destination.h>
@@ -2126,7 +2127,7 @@
  #include <libedataserver/e-xml-utils.h>
  
 --- evolution-2.10.0/addressbook/gui/component/autocompletion-config.c.use-glib-i18n	2007-01-03 10:32:46.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  
  #include <libedataserver/e-source-list.h>
@@ -2137,7 +2138,7 @@
  #include <gtk/gtktreeselection.h>
  #include <gtk/gtkwidget.h>
 --- evolution-2.10.0/addressbook/gui/component/addressbook-view.c.use-glib-i18n	2007-02-26 04:59:17.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtknotebook.h>
  #include <gtk/gtkwidget.h>
@@ -2147,8 +2148,8 @@
  #include <libgnomeui/gnome-app.h>
  #include <libgnomeui/gnome-href.h>
  #include <libgnomeui/gnome-uidefs.h>
---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <string.h>
@@ -2159,7 +2160,7 @@
  #include <gtk/gtkentry.h>
  #include <gtk/gtktogglebutton.h>
 --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  #include <gtk/gtksignal.h>
  #include <misc/e-canvas-background.h>
@@ -2170,7 +2171,7 @@
  #include "eab-marshal.h"
  #include "e-minicard-view-widget.h"
 --- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c	2007-04-03 15:07:43.000000000 -0400
 @@ -4,7 +4,7 @@
  #include <config.h>
  #include <string.h>
@@ -2181,7 +2182,7 @@
  #include "e-addressbook-reflow-adapter.h"
  #include "e-addressbook-model.h"
 --- evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include "e-util/e-icon-factory.h"
  
@@ -2192,7 +2193,7 @@
  #include <gtkhtml/gtkhtml.h>
  #include <gtkhtml/gtkhtml-stream.h>
 --- evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c	2007-04-03 15:07:43.000000000 -0400
 @@ -13,7 +13,7 @@
  #endif
  
@@ -2203,7 +2204,7 @@
  #include "gal-view-minicard.h"
  
 --- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n	2007-03-08 01:10:56.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <gtk/gtk.h>
@@ -2214,7 +2215,7 @@
  #include <gtk/gtkscrolledwindow.h>
  #include <table/e-table-scrolled.h>
 --- evolution-2.10.0/addressbook/gui/widgets/e-minicard.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <gtk/gtkdnd.h>
  #include <gtk/gtkmain.h>
@@ -2225,7 +2226,7 @@
  #include <libgnomecanvas/gnome-canvas-pixbuf.h>
  #include <text/e-text.h>
 --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  
  #include <gtk/gtksignal.h>
@@ -2236,7 +2237,7 @@
  #include <text/e-text.h>
  #include <misc/e-canvas.h>
 --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtkdnd.h>
  #include <gdk/gdkkeysyms.h>
@@ -2247,7 +2248,7 @@
  #include "a11y/addressbook/ea-addressbook.h"
  
 --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n	2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  #include <e-util/e-icon-factory.h>
  #include <e-util/e-util-private.h>
@@ -2257,8 +2258,8 @@
  #include <gtk/gtkcombo.h>
  #include <gtk/gtkstock.h>
  #include <gtk/gtkentry.h>
---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtktable.h>
  #include <gtk/gtkdialog.h>
@@ -2269,7 +2270,7 @@
  #include <libebook/e-book.h>
  #include <libebook/e-contact.h>
 --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n	2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <e-util/e-util-private.h>
  
@@ -2280,7 +2281,7 @@
  #include <misc/e-gui-utils.h>
  #include <gtk/gtkcombo.h>
 --- evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n	2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <gtk/gtkstock.h>
@@ -2291,7 +2292,7 @@
  #include "eab-editor.h"
  #include "addressbook/gui/widgets/eab-gui-util.h"
 --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n	2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c	2007-04-03 15:07:43.000000000 -0400
 @@ -22,7 +22,7 @@
  #include <config.h>
  #include "e-contact-editor-im.h"
@@ -2301,8 +2302,8 @@
  #include <gtk/gtkbox.h>
  #include <gtk/gtkentry.h>
  #include <gtk/gtkhbox.h>
---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gtk/gtklabel.h>
  #include <libgnomeui/gnome-window-icon.h>
@@ -2312,8 +2313,8 @@
  #include <libgnome/gnome-help.h>
  
  #include <gdk-pixbuf/gdk-pixbuf.h>
---- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/composer/e-msg-composer.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/composer/e-msg-composer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -63,7 +63,7 @@
  
  #include <libgnome/gnome-exec.h>
@@ -2324,7 +2325,7 @@
  #include <libgnomeui/gnome-window-icon.h>
  
 --- evolution-2.10.0/composer/e-msg-composer-select-file.c.use-glib-i18n	2007-01-03 10:34:14.000000000 -0500
-+++ evolution-2.10.0/composer/e-msg-composer-select-file.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/composer/e-msg-composer-select-file.c	2007-04-03 15:07:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #endif
  
@@ -2335,7 +2336,7 @@
  #include "e-msg-composer-select-file.h"
  #include <e-util/e-icon-factory.h>
 --- evolution-2.10.0/composer/e-msg-composer-hdrs.c.use-glib-i18n	2007-01-03 10:34:14.000000000 -0500
-+++ evolution-2.10.0/composer/e-msg-composer-hdrs.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/composer/e-msg-composer-hdrs.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtkoptionmenu.h>
  #include <gtk/gtktooltips.h>
@@ -2346,7 +2347,7 @@
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
 --- evolution-2.10.0/shell/e-shell-window.c.use-glib-i18n	2007-03-12 16:17:12.000000000 -0400
-+++ evolution-2.10.0/shell/e-shell-window.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-window.c	2007-04-03 15:07:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <bonobo/bonobo-widget.h>
@@ -2357,7 +2358,7 @@
  
  #include <gconf/gconf-client.h>
 --- evolution-2.10.0/shell/e-shell-utils.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-shell-utils.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <glib.h>
  
@@ -2368,7 +2369,7 @@
  #include "e-util/e-util-private.h"
  
 --- evolution-2.10.0/shell/e-shell.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-shell.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell.c	2007-04-03 15:07:43.000000000 -0400
 @@ -44,7 +44,7 @@
  #undef interface
  #endif
@@ -2379,7 +2380,7 @@
  
  #include <gconf/gconf-client.h>
 --- evolution-2.10.0/shell/e-shell-folder-title-bar.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-shell-folder-title-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-folder-title-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtkrc.h>
  #include <gtk/gtksignal.h>
@@ -2390,7 +2391,7 @@
  
  #include "misc/e-clipped-label.h"
 --- evolution-2.10.0/shell/e-shell-settings-dialog.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-shell-settings-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-settings-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -148,9 +148,9 @@
  {
  	EShellSettingsDialogPrivate *priv;
@@ -2438,7 +2439,7 @@
  	page_list = sort_page_list (page_list);
  	for (p = page_list, i = 0; p != NULL; p = p->next, i++) {
 --- evolution-2.10.0/shell/e-user-creatable-items-handler.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-user-creatable-items-handler.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-user-creatable-items-handler.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <bonobo/bonobo-exception.h>
  #include <bonobo/bonobo-control.h>
@@ -2448,8 +2449,8 @@
  
  #include <gtk/gtkaccelgroup.h>
  #include <gtk/gtkimage.h>
---- evolution-2.10.0/shell/main.c.use-glib-i18n	2007-03-18 08:26:55.000000000 -0400
-+++ evolution-2.10.0/shell/main.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/shell/main.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/shell/main.c	2007-04-03 15:07:43.000000000 -0400
 @@ -55,7 +55,7 @@
  #include <gtk/gtkdialog.h>
  #include <gtk/gtkstock.h>
@@ -2460,7 +2461,7 @@
  #include <libgnome/gnome-sound.h>
  #include <libgnomeui/gnome-ui-init.h>
 --- evolution-2.10.0/shell/evolution-shell-component-utils.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/evolution-shell-component-utils.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/evolution-shell-component-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include "e-util/e-dialog-utils.h"
  
@@ -2471,7 +2472,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <bonobo/bonobo-moniker-util.h>
 --- evolution-2.10.0/shell/e-shell-window-commands.c.use-glib-i18n	2007-03-12 08:40:01.000000000 -0400
-+++ evolution-2.10.0/shell/e-shell-window-commands.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-window-commands.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <glib/gprintf.h>
  
@@ -2497,7 +2498,7 @@
  		/* This has to be a valid language AND a language with
  		 * no encoding postfix.  The language will come up without
 --- evolution-2.10.0/shell/e-component-registry.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-component-registry.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-component-registry.c	2007-04-03 15:07:43.000000000 -0400
 @@ -28,7 +28,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -2559,7 +2560,7 @@
  	CORBA_free (info_list);
  	CORBA_exception_free (&ev);
 --- evolution-2.10.0/shell/e-shell-importer.c.use-glib-i18n	2007-01-03 10:32:54.000000000 -0500
-+++ evolution-2.10.0/shell/e-shell-importer.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/shell/e-shell-importer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  
  #include <glade/glade.h>
@@ -2570,7 +2571,7 @@
  #include <libgnomeui/gnome-druid.h>
  #include <libgnomeui/gnome-druid-page-edge.h>
 --- evolution-2.10.0/calendar/gui/print.c.use-glib-i18n	2007-02-26 05:01:17.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/print.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/print.c	2007-04-03 15:07:43.000000000 -0400
 @@ -34,7 +34,7 @@
  #include <glib.h>
  #include <gtk/gtkradiobutton.h>
@@ -2581,7 +2582,7 @@
  #include <libgnomeui/gnome-uidefs.h>
  #include <libgnomeui/gnome-stock-icons.h>
 --- evolution-2.10.0/calendar/gui/calendar-view-factory.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/calendar-view-factory.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/calendar-view-factory.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #endif
  
@@ -2592,7 +2593,7 @@
  #include "calendar-view.h"
  
 --- evolution-2.10.0/calendar/gui/itip-utils.c.use-glib-i18n	2007-01-08 08:36:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/itip-utils.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/itip-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <bonobo/bonobo-exception.h>
  #include <bonobo/bonobo-object.h>
@@ -2603,7 +2604,7 @@
  #include <gtk/gtkmessagedialog.h>
  #include <gtk/gtkwidget.h>
 --- evolution-2.10.0/calendar/gui/alarm-notify/util.c.use-glib-i18n	2007-01-03 10:34:50.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/alarm-notify/util.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/alarm-notify/util.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #include <config.h>
  #endif
@@ -2613,8 +2614,8 @@
  #include <libedataserver/e-time-utils.h>
  #include <libecal/e-cal-time-util.h>
  #include "config-data.h"
---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c	2007-04-03 15:07:43.000000000 -0400
 @@ -43,7 +43,7 @@
  #include <gtk/gtkstock.h>
  #include <gtk/gtktooltips.h>
@@ -2625,7 +2626,7 @@
  #include <libgnome/gnome-sound.h>
  #include <libgnomeui/gnome-dialog-util.h>
 --- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n	2007-01-03 10:34:50.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtkscrolledwindow.h>
  #include <gtk/gtkwindow.h>
@@ -2635,8 +2636,8 @@
  #if 0 
  #  include <libgnomeui/gnome-winhints.h>
  #endif
---- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  #include <glib.h>
@@ -2646,8 +2647,8 @@
  #include <libgnome/gnome-init.h>
  #include <libgnome/gnome-sound.h>
  #include <libgnomeui/gnome-client.h>
---- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-itip-control.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-itip-control.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -2658,7 +2659,7 @@
  #include <libgnomeui/gnome-stock-icons.h>
  #include <libgnomeui/gnome-uidefs.h>
 --- evolution-2.10.0/calendar/gui/e-day-view-top-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #endif
  
@@ -2669,7 +2670,7 @@
  #include <libecal/e-cal-time-util.h>
  #include <libedataserver/e-data-server-util.h>
 --- evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -34,7 +34,7 @@
  
  #include <time.h>
@@ -2679,8 +2680,8 @@
  #include "calendar-config.h"
  #include "e-meeting-time-sel-item.h"
  #include "e-meeting-time-sel.h"
---- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <bonobo/bonobo-control.h>
  #include <bonobo/bonobo-widget.h>
@@ -2691,7 +2692,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  #include <libebook/e-book.h>
 --- evolution-2.10.0/calendar/gui/tasks-control.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/tasks-control.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/tasks-control.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtklabel.h>
  #include <gtk/gtkcheckbutton.h>
@@ -2702,7 +2703,7 @@
  #include <libgnomeui/gnome-dialog.h>
  #include <libgnomeui/gnome-dialog-util.h>
 --- evolution-2.10.0/calendar/gui/e-cal-model-calendar.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #endif
  
@@ -2713,7 +2714,7 @@
  #include "e-cell-date-edit-text.h"
  #include "itip-utils.h"
 --- evolution-2.10.0/calendar/gui/dialogs/memo-editor.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <string.h>
@@ -2723,8 +2724,8 @@
  
  #include <evolution-shell-component-utils.h>
  #include <e-util/e-util-private.h>
---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/task-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtkspinbutton.h>
  #include <gtk/gtkoptionmenu.h>
@@ -2735,7 +2736,7 @@
  #include <libedataserverui/e-source-combo-box.h>
  #include <misc/e-dateedit.h>
 --- evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtktreeview.h>
  #include <gtk/gtktreeselection.h>
@@ -2746,7 +2747,7 @@
  #include <libedataserver/e-time-utils.h>
  #include "e-util/e-dialog-widgets.h"
 --- evolution-2.10.0/calendar/gui/dialogs/comp-editor.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -34,7 +34,7 @@
  #include <bonobo/bonobo-ui-util.h>
  #include <bonobo/bonobo-widget.h>
@@ -2757,7 +2758,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  #include <libgnomeui/gnome-uidefs.h>
 --- evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <gtk/gtktreeselection.h>
  #include <gtk/gtkdialog.h>
@@ -2767,8 +2768,8 @@
  #include <glade/glade.h>
  #include <libedataserver/e-time-utils.h>
  #include <e-util/e-dialog-widgets.h>
---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/event-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkmessagedialog.h>
@@ -2779,7 +2780,7 @@
  #include <libedataserverui/e-source-combo-box.h>
  #include "common/authentication.h"
 --- evolution-2.10.0/calendar/gui/dialogs/task-editor.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <string.h>
@@ -2789,8 +2790,8 @@
  
  #include <e-util/e-icon-factory.h>
  #include <e-util/e-util-private.h>
---- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <libedataserver/e-source.h>
@@ -2801,7 +2802,7 @@
  #include <libecal/e-cal.h>
  #include "calendar-setup.h"
 --- evolution-2.10.0/calendar/gui/dialogs/recur-comp.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <glib.h>
@@ -2812,7 +2813,7 @@
  #include "recur-comp.h"
  
 --- evolution-2.10.0/calendar/gui/dialogs/delete-comp.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <gtk/gtkstock.h>
  #include <gtk/gtk.h>
@@ -2823,7 +2824,7 @@
  #include "e-util/e-error.h"
  #include "../calendar-config.h"
 --- evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #endif
  
@@ -2834,7 +2835,7 @@
  #include <libgnomeui/gnome-dialog-util.h>
  #include "comp-editor-page.h"
 --- evolution-2.10.0/calendar/gui/dialogs/delete-error.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <glib.h>
@@ -2845,7 +2846,7 @@
  #include <e-util/e-icon-factory.h>
  #include "delete-error.h"
 --- evolution-2.10.0/calendar/gui/dialogs/task-details-page.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  
  #include <gtk/gtksignal.h>
@@ -2856,7 +2857,7 @@
  #include <misc/e-dateedit.h>
  #include <misc/e-url-entry.h>
 --- evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c	2007-04-03 15:07:43.000000000 -0400
 @@ -45,7 +45,7 @@
  #endif
  
@@ -2867,7 +2868,7 @@
  #include "cal-attachment-select-file.h"
  #include <e-util/e-icon-factory.h>
 --- evolution-2.10.0/calendar/gui/dialogs/event-editor.c.use-glib-i18n	2007-03-08 01:11:21.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <string.h>
@@ -2878,7 +2879,7 @@
  #include <e-util/e-icon-factory.h>
  #include <e-util/e-util-private.h>
 --- evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <glib.h>
@@ -2889,7 +2890,7 @@
  #include <e-util/e-icon-factory.h>
  #include "e-util/e-error.h"
 --- evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <libical/ical.h>
  #include <glib.h>
@@ -2899,8 +2900,8 @@
  #include <bonobo-activation/bonobo-activation.h>
  #include <bonobo/bonobo-control.h>
  #include <bonobo/bonobo-widget.h>
---- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <widgets/misc/e-dateedit.h>
  #include <e-util/e-dialog-widgets.h>
@@ -2911,7 +2912,7 @@
  
  static const int week_start_day_map[] = {
 --- evolution-2.10.0/calendar/gui/dialogs/schedule-page.c.use-glib-i18n	2007-03-08 01:11:21.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gtk/gtktogglebutton.h>
  #include <gtk/gtkvbox.h>
@@ -2922,7 +2923,7 @@
  #include <glade/glade.h>
  #include <e-util/e-dialog-widgets.h>
 --- evolution-2.10.0/calendar/gui/dialogs/changed-comp.c.use-glib-i18n	2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <glib.h>
@@ -2932,8 +2933,8 @@
  #include <libgnomeui/gnome-uidefs.h>
  #include <e-util/e-icon-factory.h>
  #include "changed-comp.h"
---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  #include <gtk/gtkspinbutton.h>
  #include <gtk/gtkoptionmenu.h>
@@ -2944,7 +2945,7 @@
  #include <libedataserverui/e-source-combo-box.h>
  #include <libedataserverui/e-name-selector.h>
 --- evolution-2.10.0/calendar/gui/e-meeting-time-sel.c.use-glib-i18n	2007-03-08 01:11:21.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c	2007-04-03 15:07:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <gtk/gtkvbox.h>
  #include <gtk/gtkvscrollbar.h>
@@ -2955,7 +2956,7 @@
  
  #include <misc/e-canvas.h>
 --- evolution-2.10.0/calendar/gui/calendar-commands.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/calendar-commands.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/calendar-commands.c	2007-04-03 15:07:43.000000000 -0400
 @@ -47,7 +47,7 @@
  #include <libgnomeui/gnome-messagebox.h>
  #include <libgnomeui/gnome-stock-icons.h>
@@ -2966,7 +2967,7 @@
  #include <bonobo/bonobo-exception.h>
  #include <libecal/e-cal-time-util.h>
 --- evolution-2.10.0/calendar/gui/memos-control.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/memos-control.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/memos-control.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <gtk/gtklabel.h>
  #include <gtk/gtkcheckbutton.h>
@@ -2977,7 +2978,7 @@
  #include <libgnomeui/gnome-dialog.h>
  #include <libgnomeui/gnome-dialog-util.h>
 --- evolution-2.10.0/calendar/gui/misc.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/misc.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/misc.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <ctype.h>
  #include <time.h>
@@ -2987,8 +2988,8 @@
  
  #include "misc.h"
  
---- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <math.h>
  #include <string.h>
@@ -2999,7 +3000,7 @@
  #include "calendar-config.h"
  #include "e-cal-model-tasks.h"
 --- evolution-2.10.0/calendar/gui/e-calendar-view.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-calendar-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-calendar-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gtk/gtkbox.h>
  #include <gtk/gtkcontainer.h>
@@ -3010,7 +3011,7 @@
  #include <e-util/e-error.h>
  #include <e-util/e-dialog-utils.h>
 --- evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <string.h>
  #include <libgnomeui/gnome-messagebox.h>
@@ -3021,7 +3022,7 @@
  #include <libedataserver/e-data-server-util.h>
  #include <e-util/e-util.h>
 --- evolution-2.10.0/calendar/gui/e-timezone-entry.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-timezone-entry.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-timezone-entry.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <gtk/gtksignal.h>
  #include <gnome.h>
@@ -3032,7 +3033,7 @@
  #include <e-util/e-icon-factory.h>
  
 --- evolution-2.10.0/calendar/gui/e-alarm-list.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-alarm-list.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-alarm-list.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <gtk/gtktreemodel.h>
  #include <gtk/gtksignal.h>
@@ -3042,8 +3043,8 @@
  #include <glib.h>
  #include <libecal/e-cal-time-util.h>
  #include <libedataserver/e-time-utils.h>
---- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-day-view.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-day-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <misc/e-gui-utils.h>
  #include <misc/e-unicode.h>
@@ -3053,8 +3054,8 @@
  #include <libgnome/gnome-exec.h>
  #include <libgnome/gnome-util.h>
  #include <e-util/e-categories-config.h>
---- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-cal-model.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <string.h>
@@ -3065,7 +3066,7 @@
  #include <libecal/e-cal-time-util.h>
  #include "comp-util.h"
 --- evolution-2.10.0/calendar/gui/weekday-picker.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/weekday-picker.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/weekday-picker.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  #include <gtk/gtksignal.h>
@@ -3075,8 +3076,8 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  #include <libgnomecanvas/gnome-canvas-text.h>
  #include "weekday-picker.h"
---- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-week-view.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-week-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #include <gtk/gtkvscrollbar.h>
  #include <gtk/gtkwindow.h>
@@ -3087,7 +3088,7 @@
  #include <libgnome/gnome-util.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
 --- evolution-2.10.0/calendar/gui/e-cal-model-memos.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -3098,7 +3099,7 @@
  #include "e-cell-date-edit-text.h"
  #include "misc.h"
 --- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/main.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/main.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -3109,7 +3110,7 @@
  #include <libgnomevfs/gnome-vfs-init.h>
  #include <glade/glade.h>
 --- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/cal-search-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/cal-search-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtkmenuitem.h>
  #include <gtk/gtkoptionmenu.h>
@@ -3120,7 +3121,7 @@
  #include <e-util/e-icon-factory.h>
  #include <libedataserver/e-categories.h>
 --- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtksignal.h>
  #include <gtk/gtkradiomenuitem.h>
@@ -3131,7 +3132,7 @@
  #include "e-day-view-time-item.h"
  #include "calendar-config.h"
 --- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <camel/camel-mime-part.h>
  #include <camel/camel-stream-vfs.h>
@@ -3141,8 +3142,8 @@
  #include "e-util/e-mktemp.h"
  #include "e-util/e-dialog-utils.h"
  
---- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-meeting-store.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-meeting-store.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -3153,7 +3154,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  #include <libebook/e-book.h>
 --- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include <string.h>
@@ -3164,7 +3165,7 @@
  #include "ea-calendar.h"
  
 --- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/gnome-cal.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/gnome-cal.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <glib.h>
  #include <gdk/gdkkeysyms.h>
@@ -3175,7 +3176,7 @@
  #include <libgnomeui/gnome-dialog.h>
  #include <libgnomeui/gnome-dialog-util.h>
 --- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-list-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-list-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -50,7 +50,7 @@
  #include <table/e-cell-combo.h>
  #include <misc/e-popup-menu.h>
@@ -3186,7 +3187,7 @@
  #include <libgnome/gnome-util.h>
  #include <e-util/e-categories-config.h>
 --- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert-db.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-cert-db.c	2007-04-03 15:07:43.000000000 -0400
 @@ -90,7 +90,7 @@
  #include "e-util/e-dialog-utils.h"
  #include "e-util/e-util-private.h"
@@ -3197,7 +3198,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
 --- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-cert.c	2007-04-03 15:07:43.000000000 -0400
 @@ -62,7 +62,7 @@
  
  #include <time.h>
@@ -3208,7 +3209,7 @@
  #include <e-util/e-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
  
 --- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-pkcs12.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-pkcs12.c	2007-04-03 15:07:43.000000000 -0400
 @@ -63,7 +63,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -3219,7 +3220,7 @@
  
  #include <time.h>
 --- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-viewer.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/certificate-viewer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <gtk/gtk.h>
@@ -3230,7 +3231,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-manager.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/certificate-manager.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3241,7 +3242,7 @@
  #include <glade/glade.h>
  #include "evolution-config-control.h"
 --- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/e-cert-selector.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/e-cert-selector.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #include <config.h>
  #endif
@@ -3252,7 +3253,7 @@
  #include <gtk/gtktextview.h>
  #include <gtk/gtkoptionmenu.h>
 --- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/cert-trust-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/cert-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtkdialog.h>
  #include <gtk/gtklabel.h>
@@ -3263,7 +3264,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/smime/gui/component.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/component.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/component.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3274,7 +3275,7 @@
  
  #include "ca-trust-dialog.h"
 --- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/ca-trust-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/ca-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <gtk/gtk.h>
@@ -3285,7 +3286,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/tools/killev.c.use-glib-i18n	2007-01-03 10:32:49.000000000 -0500
-+++ evolution-2.10.0/tools/killev.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/tools/killev.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <bonobo/bonobo-exception.h>
diff --git a/evolution.spec b/evolution.spec
index e40d2f3..1b5e8d1 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -733,6 +733,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Apr 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-8.fc7
+- Revise patch for GNOME bug #419524 to fix RH bug #235082
+  (crash in initial account setup wizard).
+
 * Mon Apr 02 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-7.fc7
 - Add patch for RH bug #231767 (allow mail-notification to build).