diff --git a/evolution-2.10.0-drop-old-glib-support.patch b/evolution-2.10.0-drop-old-glib-support.patch
new file mode 100644
index 0000000..2ece0c8
--- /dev/null
+++ b/evolution-2.10.0-drop-old-glib-support.patch
@@ -0,0 +1,39 @@
+--- evolution-2.10.0/mail/em-utils.c.drop-old-glib-support	2007-03-18 08:17:46.000000000 -0400
++++ evolution-2.10.0/mail/em-utils.c	2007-03-18 08:24:07.000000000 -0400
+@@ -42,10 +42,6 @@
+ #undef interface
+ #endif
+ 
+-#if !GLIB_CHECK_VERSION (2, 8, 0)
+-#define g_access access
+-#endif
+-
+ #include <camel/camel-stream-fs.h>
+ #include <camel/camel-url-scanner.h>
+ #include <camel/camel-file-utils.h>
+--- evolution-2.10.0/mail/mail-config.c.drop-old-glib-support	2007-01-03 10:34:12.000000000 -0500
++++ evolution-2.10.0/mail/mail-config.c	2007-03-18 08:24:07.000000000 -0400
+@@ -76,10 +76,6 @@
+ #include "mail-mt.h"
+ #include "mail-tools.h"
+ 
+-#if !GLIB_CHECK_VERSION (2, 8, 0)
+-#define g_creat creat
+-#endif
+-
+ /* Note, the first element of each MailConfigLabel must NOT be translated */
+ MailConfigLabel label_defaults[5] = {
+ 	{ "important", N_("I_mportant"), "#ff0000" },  /* red */
+--- evolution-2.10.0/plugins/save-attachments/save-attachments.c.drop-old-glib-support	2007-03-18 08:17:29.000000000 -0400
++++ evolution-2.10.0/plugins/save-attachments/save-attachments.c	2007-03-18 08:24:07.000000000 -0400
+@@ -32,10 +32,6 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
+-#if !GLIB_CHECK_VERSION (2, 8, 0)
+-#define g_access access
+-#endif
+-
+ #include <gtk/gtkcheckbutton.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkmessagedialog.h>
diff --git a/evolution-2.10.0-shell-main-cleanups.patch b/evolution-2.10.0-shell-main-cleanups.patch
new file mode 100644
index 0000000..2549279
--- /dev/null
+++ b/evolution-2.10.0-shell-main-cleanups.patch
@@ -0,0 +1,274 @@
+--- evolution-2.10.0/shell/main.c.shell-main-cleanups	2007-03-17 22:19:29.000000000 -0400
++++ evolution-2.10.0/shell/main.c	2007-03-17 22:21:01.000000000 -0400
+@@ -88,6 +88,9 @@
+ 
+ #include "e-util/e-plugin.h"
+ 
++#define SKIP_WARNING_DIALOG_KEY \
++	"/apps/evolution/shell/skip_warning_dialog"
++
+ static EShell *shell = NULL;
+ 
+ /* Command-line options.  */
+@@ -100,7 +103,7 @@
+ #endif
+ static gboolean disable_eplugin = FALSE;
+ 
+-static gint idle_cb (void *data);
++static gboolean idle_cb (gchar **uris);
+ 
+ static char *default_component_id = NULL;
+ static char *evolution_debug_log = NULL;
+@@ -133,6 +136,7 @@
+ 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null");
+ 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null");
+ 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null");
++	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.8 2> /dev/null");
+ 
+ 	system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null");
+ 	system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null");
+@@ -182,35 +186,15 @@
+ 
+ /* Warning dialog to scare people off a little bit.  */
+ 
+-static void
+-warning_dialog_response_callback (GtkDialog *dialog,
+-				 int button_number,
+-				 void *data)
+-{
+-	GtkCheckButton *dont_bother_me_again_checkbox;
+-	GConfClient *client;
+-
+-	dont_bother_me_again_checkbox = GTK_CHECK_BUTTON (data);
+-
+-	client = gconf_client_get_default ();
+-	gconf_client_set_bool (client, "/apps/evolution/shell/skip_warning_dialog",
+-			       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dont_bother_me_again_checkbox)),
+-			       NULL);
+-	g_object_unref (client);
+-
+-	gtk_widget_destroy (GTK_WIDGET (dialog));
+-
+-	idle_cb(NULL);
+-}
+-
+-static void
++static gboolean
+ show_development_warning(void)
+ {
+ 	GtkWidget *vbox;
+ 	GtkWidget *label;
+ 	GtkWidget *warning_dialog;
+-	GtkWidget *dont_bother_me_again_checkbox;
++	GtkWidget *checkbox;
+ 	GtkWidget *alignment;
++	gboolean skip;
+ 	char *text;
+ 
+ 	warning_dialog = gtk_dialog_new ();
+@@ -262,59 +246,58 @@
+ 
+ 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ 
+-	dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Do not tell me again"));
++	checkbox = gtk_check_button_new_with_label (_("Do not tell me again"));
+ 
+ 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
+ 
+-	gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox);
++	gtk_container_add (GTK_CONTAINER (alignment), checkbox);
+ 	gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0);
+ 
+ 	gtk_widget_show_all (warning_dialog);
+ 
+-	g_signal_connect (warning_dialog, "response",
+-			  G_CALLBACK (warning_dialog_response_callback),
+-			  dont_bother_me_again_checkbox);
++	gtk_dialog_run (GTK_DIALOG (warning_dialog));
++
++	skip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
++
++	gtk_widget_destroy (warning_dialog);
++
++	idle_cb (NULL);
++
++	return skip;
+ }
+ 
+ static void
+-destroy_config (void)
++destroy_config (GConfClient *client)
+ {
+-	GConfClient *gconf;
+-	
+-	gconf = gconf_client_get_default ();
+-
+ 	/* Unset the source stuff */
+-	gconf_client_unset (gconf, "/apps/evolution/calendar/sources", NULL);
+-	gconf_client_unset (gconf, "/apps/evolution/tasks/sources", NULL);
+-	gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL);
+-	gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL);
++	gconf_client_unset (client, "/apps/evolution/calendar/sources", NULL);
++	gconf_client_unset (client, "/apps/evolution/tasks/sources", NULL);
++	gconf_client_unset (client, "/apps/evolution/addressbook/sources", NULL);
+ 
+ 	/* Reset the version */
+-	gconf_client_set_string (gconf, "/apps/evolution/version", "1.4.0", NULL);
++	gconf_client_set_string (client, "/apps/evolution/version", "1.4.0", NULL);
+ 
+ 	/* Clear the dir */
+ 	system ("rm -Rf ~/.evolution");
+-	
+-	g_object_unref (gconf);
+ }
+ 
+ #endif /* DEVELOPMENT */
+ 
+ static void
+-open_uris (GNOME_Evolution_Shell corba_shell, GSList *uri_list)
++open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris)
+ {
+-	GSList *p;
+ 	CORBA_Environment ev;
++	guint n_uris, ii;
+ 
+-	CORBA_exception_init (&ev);
++	g_assert (uris != NULL);
++	n_uris = g_strv_length (uris);
+ 
+-	for (p = uri_list; p != NULL; p = p->next) {
+-		const char *uri;
++	CORBA_exception_init (&ev);
+ 
+-		uri = (const char *) p->data;
+-		GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev);
++	for (ii = 0; ii < n_uris; ii++) {
++		GNOME_Evolution_Shell_handleURI (corba_shell, uris[ii], &ev);
+ 		if (ev._major != CORBA_NO_EXCEPTION) {
+-			g_warning ("Invalid URI: %s", uri);
++			g_warning ("Invalid URI: %s", uris[ii]);
+ 			CORBA_exception_free (&ev);
+ 		}
+ 	}
+@@ -324,23 +307,22 @@
+ 
+ /* This is for doing stuff that requires the GTK+ loop to be running already.  */
+ 
+-static gint
+-idle_cb (void *data)
++static gboolean
++idle_cb (gchar **uris)
+ {
+-	GSList *uri_list;
+ 	GNOME_Evolution_Shell corba_shell;
+ 	CORBA_Environment ev;
+ 	EShellConstructResult result;
+ 	EShellStartupLineMode startup_line_mode;
+ 
++	g_assert (uris == NULL || g_strv_length (uris) > 0);
++
+ #ifdef KILL_PROCESS_CMD
+ 	kill_old_dataserver ();
+ #endif
+ 
+ 	CORBA_exception_init (&ev);
+ 
+-	uri_list = (GSList *) data;
+-
+ 	if (! start_online && ! start_offline)
+ 		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG;
+ 	else if (start_online)
+@@ -378,15 +360,16 @@
+ 	}
+ 
+ 	if (shell != NULL) {
+-		if (g_slist_length (uri_list) == 0)
++		if (uris != NULL)
++			open_uris (corba_shell, uris);
++		else
+ 			e_shell_create_window (shell, default_component_id, NULL);
+-		open_uris (corba_shell, uri_list);
+ 	} else {
+ 		CORBA_Environment ev;
+ 
+ 		CORBA_exception_init (&ev);
+-		if (uri_list != NULL)
+-			open_uris (corba_shell, uri_list);
++		if (uris != NULL)
++			open_uris (corba_shell, uris);
+ 		else
+ 			if (default_component_id == NULL)
+ 				GNOME_Evolution_Shell_createNewWindow (corba_shell, "", &ev);
+@@ -396,8 +379,6 @@
+ 		CORBA_exception_free (&ev);
+ 	}
+ 
+-	g_slist_free (uri_list);
+-
+ 	CORBA_Object_release (corba_shell, &ev);
+ 
+ 	CORBA_exception_free (&ev);
+@@ -501,7 +482,6 @@
+ 	GConfClient *client;
+ 	gboolean skip_warning_dialog;
+ #endif
+-	GSList *uri_list;
+ 	GnomeProgram *program;
+ 	GOptionContext *context;
+ 	char *filename;
+@@ -543,8 +523,10 @@
+ #endif
+ 
+ #if DEVELOPMENT
++	client = g_conf_client_get_default ();
++
+ 	if (force_migrate) {
+-		destroy_config ();
++		destroy_config (client);
+ 	}
+ #endif
+ 	
+@@ -571,17 +553,6 @@
+ 	if (setup_only)
+ 		exit (0);
+ 
+-	uri_list = NULL;
+-
+-	if (remaining_args != NULL) {
+-		const char **p;
+-
+-		for (p = (const char**)remaining_args; *p != NULL; p++)
+-			uri_list = g_slist_prepend (uri_list, (char *) *p);
+-	}
+-	uri_list = g_slist_reverse (uri_list);
+-	
+-
+ 	gnome_sound_init ("localhost");
+ 
+ 	if (!disable_eplugin) {
+@@ -597,15 +568,20 @@
+ 	}
+ 
+ #if DEVELOPMENT
+-	client = gconf_client_get_default ();
+-	skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL);
+-	g_object_unref (client);
++	skip_warning_dialog = gconf_client_get_bool (
++		client, SKIP_WARNING_DIALOG_KEY, NULL);
+ 
+ 	if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER"))
+-		show_development_warning();
++		gconf_client_set_bool (
++			client, SKIP_WARNING_DIALOG_KEY,
++			show_development_warning (), NULL);
+ 	else
++		g_idle_add ((GSourceFunc) idle_cb, remaining_args);
++
++	g_object_unref (client);
++#else
++	g_idle_add ((GSourceFunc) idle_cb, remaining_args);	
+ #endif
+-		g_idle_add (idle_cb, uri_list);	
+ 	
+ 	bonobo_main ();
+ 	
diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch
new file mode 100644
index 0000000..e14f818
--- /dev/null
+++ b/evolution-2.10.0-use-glib-i18n.patch
@@ -0,0 +1,3328 @@
+--- 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
+@@ -52,7 +52,7 @@
+ #include <gconf/gconf-client.h>
+ 
+ #include <libgnomeui/gnome-pixmap.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -41,7 +41,7 @@
+ #include <libgnome/gnome-url.h>
+ #include <libgnomevfs/gnome-vfs-mime.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ 
+ #include <libedataserver/e-data-server-util.h>
+ #include <e-util/e-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -64,7 +64,7 @@
+ #include <gtk/gtkcombobox.h>
+ #include <gtk/gtktable.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-druid.h>
+ #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
+@@ -37,7 +37,7 @@
+ #include <gconf/gconf.h>
+ #include <gconf/gconf-client.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtkhbox.h>
+ 
+ #include <e-util/e-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -33,7 +33,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 
+ /* 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
+@@ -35,7 +35,7 @@
+ #include <camel/camel-url.h>
+ 
+ #include <libedataserver/e-iconv.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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 @@
+ #include <libgnomevfs/gnome-vfs-mime.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -78,7 +78,7 @@
+ 
+ #include <table/e-tree.h>
+ #include <table/e-tree-memory.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -38,7 +38,7 @@
+ 
+ #include <gmodule.h>
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -39,7 +39,7 @@
+ #include <gtk/gtkbox.h>
+ #include <gtk/gtkscrolledwindow.h>
+ #include <libgnomeui/gnome-window-icon.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -51,7 +51,7 @@
+ #include <gtkhtml/gtkhtml-embedded.h>
+ #include <gtkhtml/gtkhtml-stream.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -38,7 +38,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -26,7 +26,7 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -39,7 +39,7 @@
+ 
+ #include <e-util/e-mktemp.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -38,7 +38,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -44,7 +44,7 @@
+ #include <camel/camel-folder.h>
+ #include <camel/camel-vtrash-folder.h>
+ #include <camel/camel-vee-folder.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -36,7 +36,7 @@
+ #include <glib/gstdio.h>
+ 
+ #include <libgnome/gnome-exec.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -54,7 +54,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #include <e-util/e-util.h>
+ #include <libedataserver/e-data-server-util.h>
+@@ -2645,38 +2645,33 @@
+ {
+ 	GDir *dir;
+ 	const char *d;
+-	struct stat st;
+-	const GList *l;
+ 	char *local, *base;
++	const gchar * const *language_names;
+ 
+ 	/* special-case - this means brand new install of evolution */
+ 	/* FIXME: create default folders and stuff... */
+ 
+ 	d(printf("Setting up initial mail tree\n"));
+ 	
+-	base = g_build_filename(evolution_dir, "mail/local", NULL);
++	base = g_build_filename(evolution_dir, "mail", "local", NULL);
+ 	if (e_util_mkdir_hier(base, 0777) == -1 && errno != EEXIST) {
+ 		g_free(base);
+ 		return -1;
+ 	}
+ 
+ 	/* e.g. try en-AU then en, etc */
+-	for (l = gnome_i18n_get_language_list("LC_MESSAGES");
+-	     l != NULL;
+-	     l = g_list_next(l)) {
+-		local = g_build_filename(EVOLUTION_PRIVDATADIR,
+-					 "default",
+-					 (char *)l->data,
+-					 "mail/local", NULL);
+-		if (g_stat(local, &st) == 0)
+-			goto gotlocal;
+-
+-		g_free(local);
+-	}
+-
+-	local = g_build_filename(EVOLUTION_PRIVDATADIR,
+-				 "default/C/mail/local", NULL);
+-gotlocal:
++	language_names = g_get_language_names ();
++	while (*language_names != NULL) {
++		local = g_build_filename (
++			EVOLUTION_PRIVDATADIR, "default",
++			*language_names++, "mail", "local", NULL);
++		if (g_file_test (local, G_FILE_TEST_EXISTS))
++			break;
++		g_free (local);
++	}
++
++	/* Make sure we found one. */
++	g_assert (*language_names != NULL);
+ 
+ 	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
+@@ -26,7 +26,7 @@
+ 
+ #include <glib.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -44,7 +44,7 @@
+ #include "mail-config.h"
+ 
+ #include <glade/glade.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-app.h>
+ #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
+@@ -67,7 +67,7 @@
+ #include <glade/glade.h>
+ 
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -33,7 +33,7 @@
+ #include <gtk/gtkcellrenderertoggle.h>
+ #include <gtk/gtkcellrenderertext.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -37,7 +37,7 @@
+ #include <glib/gstdio.h>
+ 
+ #include <libgnome/gnome-sound.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <bonobo/bonobo-exception.h>
+ #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
+@@ -31,7 +31,7 @@
+ #include <libgnomevfs/gnome-vfs-mime.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ 
+ #include <gtk/gtk.h>
+-#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
+@@ -37,7 +37,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -28,7 +28,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <glade/glade.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ #include <libgnomecanvas/gnome-canvas.h>
+ #include <glib/gdate.h>
+ #include <e-util/e-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-data-server-util.h>
+ #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
+@@ -20,11 +20,10 @@
+  */
+ 
+ #include <config.h>
+-#include <libgnome/gnome-i18n.h>
+ #include <string.h>
+ #include <gtk/gtkaccessible.h>
+ #include <glib/gstrfuncs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "ea-minicard.h"
+ #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
+@@ -22,7 +22,7 @@
+ 
+ #include <config.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "ea-addressbook-view.h"
+ 
+ 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
+@@ -22,7 +22,7 @@
+ 
+ #include <config.h>
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "ea-minicard.h"
+ #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
+@@ -30,7 +30,7 @@
+ #include "ea-gnome-calendar.h"
+ #include "calendar-commands.h"
+ #include <glib/gstrfuncs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -28,7 +28,7 @@
+ #include "ea-week-view.h"
+ #include "e-week-view.h"
+ #include <libgnomecanvas/gnome-canvas.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -26,7 +26,7 @@
+ #include "ea-day-view.h"
+ #include "ea-week-view.h"
+ #include <text/e-text.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -29,7 +29,7 @@
+ #include "ea-gnome-calendar.h"
+ #include "calendar-commands.h"
+ #include <text/e-text.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -28,7 +28,7 @@
+ #include "ea-week-view.h"
+ #include "ea-week-view-cell.h"
+ #include "ea-cell-table.h"
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ /* 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
+@@ -28,7 +28,7 @@
+ #include "ea-day-view.h"
+ #include "ea-day-view-cell.h"
+ #include "ea-cell-table.h"
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ /* 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
+@@ -29,7 +29,7 @@
+ #include <gtk/gtknotebook.h>
+ #include <libecal/e-cal-time-util.h>
+ #include <libedataserver/e-data-server-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -30,7 +30,7 @@
+ #include "calendar-commands.h"
+ #include "goto.h"
+ #include <glib/gstrfuncs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 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
+@@ -30,7 +30,7 @@
+ 
+ #include "a11y/gal-a11y-util.h"
+ #include "table/e-cell-popup.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -15,7 +15,7 @@
+ #include "a11y/gal-a11y-util.h"
+ #include "table/e-table.h"
+ #include "table/e-tree.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -2,7 +2,7 @@
+ 
+ #include "table/e-cell-toggle.h"
+ #include "table/e-table-model.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -14,7 +14,7 @@
+ 
+ #include "a11y/gal-a11y-util.h"
+ #include "table/e-cell-text.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -14,7 +14,7 @@
+ #include "table/e-cell-tree.h"
+ #include "table/e-table.h"
+ #include "table/e-tree-table-adapter.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -13,7 +13,7 @@
+ #include "table/e-table-click-to-add.h"
+ #include "table/e-table-group.h"
+ #include "table/e-table-group-leaf.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtk.h>
+ #include <gconf/gconf.h>
+ #include <gconf/gconf-client.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog.h>
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include <gtk/gtkbox.h>
+ #include <gtk/gtkhbox.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ #include <math.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ 
+ #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
+@@ -34,7 +34,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gtk/gtkfilechooserbutton.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ #include <regex.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -43,7 +43,7 @@
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtksignal.h>
+ #include <gdk/gdkkeysyms.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-data-server-util.h>
+ #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
+@@ -42,7 +42,7 @@
+ 
+ #include <libedataserver/e-iconv.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-unicode.h"
+ 
+ #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
+@@ -32,7 +32,7 @@
+ #include <gtk/gtkimage.h>
+ #include <gtk/gtktooltips.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 
+ #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
+@@ -32,7 +32,7 @@
+ #include <libxml/tree.h>
+ #include <libxml/parser.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -58,7 +58,7 @@
+ #include <gtk/gtkmessagedialog.h>
+ #include <atk/atkrelation.h>
+ #include <atk/atkrelationset.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-time-utils.h>
+ #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
+@@ -37,7 +37,7 @@
+ #include <gtk/gtkoptionmenu.h>
+ #include <gtk/gtksignal.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -40,7 +40,7 @@
+ 
+ #include <glib.h>
+ #include <gdk/gdki18n.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ 
+ 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
+@@ -36,7 +36,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <libgnomeui/gnome-messagebox.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -44,7 +44,7 @@
+ #include <table/e-cell-text.h>
+ 
+ #include <libgnomeui/gnome-messagebox.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <gtk/gtksignal.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <libart_lgpl/art_filterlevel.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -25,7 +25,7 @@
+ 
+ #include <gdk/gdkkeysyms.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-marshal.h"
+ #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
+@@ -25,7 +25,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -28,7 +28,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtk.h>
+ #include <libgnome/libgnome.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -43,7 +43,7 @@
+ #include <gtk/gtkpixmap.h>
+ #include <gtk/gtksignal.h>
+ #include <libgnomecanvas/gnome-canvas-widget.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include "text/e-text.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-marshal.h"
+ #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
+@@ -42,7 +42,7 @@
+ #include <misc/e-unicode.h>
+ #include <misc/e-gui-utils.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -33,7 +33,7 @@
+ #include <gconf/gconf-client.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/libgnome.h>
+ 
+ #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
+@@ -51,7 +51,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkdialog.h>
+ #include <libgnomevfs/gnome-vfs-mime.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ 
+ #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
+@@ -28,7 +28,7 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -29,7 +29,7 @@
+ #include <gtk/gtksignal.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-popup-menu.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ #include <gtk/gtkdnd.h>
+ 
+ #include <libgnomevfs/gnome-vfs-ops.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include "table/e-table-scrolled.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #include "e-util/e-util-private.h"
+ #include "misc/e-unicode.h"
+@@ -92,7 +92,7 @@
+ 					    "gal-view-new-dialog.glade",
+ 					    NULL);
+ 
+-	gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
++	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+ 	g_free (filename);
+ 	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
+@@ -23,7 +23,7 @@
+ 
+ #include <config.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include "table/e-table-scrolled.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #include "e-util/e-util-private.h"
+ 
+@@ -80,7 +80,7 @@
+ }
+ 
+ /* ETable creation */
+-#define SPEC "<ETableSpecification cursor-mode=\"line\" draw-grid=\"true\" selection-mode=\"single\" gettext-domain=\"" E_I18N_DOMAIN "\">" \
++#define SPEC "<ETableSpecification cursor-mode=\"line\" draw-grid=\"true\" selection-mode=\"single\" gettext-domain=\"" GETTEXT_PACKAGE "\">" \
+ 	     "<ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"18\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" \
+              "<ETableState> <column source=\"0\"/> <grouping> </grouping> </ETableState>" \
+ 	     "</ETableSpecification>"
+@@ -250,7 +250,7 @@
+ 
+ 	dialog->collection = NULL;
+ 
+-	gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
++	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+ 	g_free (filename);
+ 	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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include "table/e-table-scrolled.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-private.h"
+ 
+ #include "gal-define-views-model.h"
+@@ -197,7 +197,7 @@
+ 
+ 	dialog->instance = NULL;
+ 
+-	gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN);
++	gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE);
+ 	g_free (filename);
+ 	dialog->gui = gui;
+ 
+@@ -235,7 +235,7 @@
+ 
+ /* For use from libglade. */
+ /* ETable creation */
+-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" draw-grid=\"false\" selection-mode=\"single\" gettext-domain=\"" E_I18N_DOMAIN "\">" \
++#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" draw-grid=\"false\" selection-mode=\"single\" gettext-domain=\"" GETTEXT_PACKAGE "\">" \
+ 	     "<ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"18\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" \
+              "<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
+@@ -36,7 +36,7 @@
+ #include <libedataserver/e-xml-utils.h>
+ #include <libedataserver/e-data-server-util.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -32,7 +32,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <libedataserver/e-xml-utils.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -20,7 +20,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ #include <libgnomeui/gnome-dialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <bonobo/bonobo-ui-util.h>
+ #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
+@@ -27,7 +27,7 @@
+ 
+ #include <libgnomecanvas/gnome-canvas.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #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
+@@ -25,7 +25,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -26,7 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -27,7 +27,7 @@
+ 
+ #include <gdk/gdkkeysyms.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #include "e-util/e-util-private.h"
+ 
+@@ -156,7 +156,7 @@
+ 	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
+ 					    "e-table-field-chooser.glade",
+ 					    NULL);
+-	gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
++	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+ 	g_free (filename);
+ 	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
+@@ -38,7 +38,7 @@
+ 
+ #include "a11y/e-table/gal-a11y-e-table-item-factory.h"
+ #include "a11y/e-table/gal-a11y-e-table-item.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -36,7 +36,7 @@
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ 
+ #include "a11y/e-table/gal-a11y-e-table.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -29,7 +29,7 @@
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ 
+ #include "text/e-text.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -29,7 +29,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -32,7 +32,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -23,7 +23,7 @@
+ 
+ #include <config.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -32,7 +32,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -35,7 +35,7 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdkkeysyms.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-marshal.h"
+ #include "e-util/e-util.h"
+ #include "e-util/e-xml-utils.h"
+@@ -1531,7 +1531,7 @@
+ 						 ((ethi->table || ethi->tree) ? 0 : 4) + 
+ 						 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
+ 						 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
+-						 128, info, E_I18N_DOMAIN);
++						 128, info, GETTEXT_PACKAGE);
+ 	
+ 	menu_item = gtk_menu_item_new_with_label (_("Sort By"));
+ 	gtk_widget_show (menu_item);
+@@ -1813,7 +1813,7 @@
+ 								 ((ethi->table || ethi->tree) ? 0 : 4) + 
+ 								 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
+ 								 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
+-								 128, info, E_I18N_DOMAIN);
++								 128, info, GETTEXT_PACKAGE);
+ 			g_object_ref (popup);
+ 			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
+@@ -32,7 +32,7 @@
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -36,7 +36,7 @@
+ #include <libgnomeui/gnome-propertybox.h>
+ #include <glade/glade.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-private.h"
+ #include "e-util/e-util.h"
+ #include "misc/e-unicode.h"
+@@ -539,7 +539,7 @@
+ 	}
+ }
+ 
+-char *spec = "<ETableSpecification gettext-domain=\"" E_I18N_DOMAIN "\" no-headers=\"true\" cursor-mode=\"line\" " 	 
++char *spec = "<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " 	 
+ " draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">" 	 
+ "<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" 	 
+ "<ETableState> <column source=\"0\"/>" 	 
+@@ -1093,14 +1093,14 @@
+ 			g_build_filename (EVOLUTION_GLADEDIR,
+ 					  "e-table-config.glade",
+ 					  NULL);
+-		gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
++		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+ 		g_free (filename);
+ 	} else {
+ 		gchar *filename =
+ 			g_build_filename (EVOLUTION_GLADEDIR,
+ 					  "e-table-config-no-group.glade",
+ 					  NULL);
+-		gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
++		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+ 		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
+@@ -50,7 +50,7 @@
+ #include "a11y/e-table/gal-a11y-e-cell-registry.h"
+ #include "a11y/e-table/gal-a11y-e-cell-text.h"
+ #include "text/e-text.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-text-event-processor.h"
+ #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
+@@ -32,7 +32,7 @@
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ 
+ #include "a11y/e-table/gal-a11y-e-tree.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -25,7 +25,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -25,7 +25,7 @@
+ #include <config.h>
+ 
+ #include "table/e-tree-table-adapter.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ 
+ #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
+@@ -59,7 +59,7 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -32,7 +32,7 @@
+ 
+ #include "a11y/e-table/gal-a11y-e-table-click-to-add.h"
+ #include "text/e-text.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-marshal.h"
+ #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
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #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
+@@ -52,7 +52,7 @@
+ #include "misc/e-canvas.h"
+ #include "misc/e-canvas-utils.h"
+ #include "misc/e-unicode.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-text-event-processor-emacs-like.h"
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include "table/e-table-scrolled.h"
+ #include "table/e-table-simple.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util-marshal.h"
+ 
+ #include "e-completion-view.h"
+@@ -623,7 +623,7 @@
+ /* XXX toshok - we need to add sorting to this etable, through the use
+    of undisplayed fields of all the sort keys we want to use */
+ static char *simple_spec = 
+-"<ETableSpecification no-headers=\"true\" draw-grid=\"false\" cursor-mode=\"line\" alternating-row-colors=\"false\" gettext-domain=\"" E_I18N_DOMAIN "\">"
++"<ETableSpecification no-headers=\"true\" draw-grid=\"false\" cursor-mode=\"line\" alternating-row-colors=\"false\" gettext-domain=\"" GETTEXT_PACKAGE "\">"
+ "  <ETableColumn model_col=\"0\" _title=\"Node\" expansion=\"1.0\" "
+ "         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
+@@ -36,7 +36,7 @@
+ #include <libxml/parser.h>
+ #include <libgnomecanvas/gnome-canvas.h>
+ 
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #include "e-util/e-util.h"
+ #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
+@@ -31,7 +31,7 @@
+ #include <calendar/gui/e-cal-config.h>
+ #include <libedataserver/e-source.h>
+ #include <libedataserver/e-url.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-config.h>
+ #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
+@@ -23,7 +23,7 @@
+ #include <gtk/gtk.h>
+ #include <glade/glade.h>
+ #include <gconf/gconf-client.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs.h>
+ #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
+@@ -27,7 +27,7 @@
+ #include <libedataserver/e-source.h>
+ #include <libedataserver/e-url.h>
+ #include <libedataserver/e-categories.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libxml/parser.h>
+ #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
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-config.h>
+ #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
+@@ -2,7 +2,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "shell/es-menu.h"
+ 
+ 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
+@@ -8,7 +8,7 @@
+ #include <string.h>
+ #include <sys/wait.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ 
+ #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
+@@ -28,7 +28,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtk.h>
+ #include <libgnome/libgnome.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ 
+ #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
+@@ -27,7 +27,7 @@
+ #include <libebook/e-book.h>
+ #include <libecal/e-cal.h>
+ #include <libedataserver/e-source.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <string.h>
+ 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
+@@ -26,7 +26,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
+ #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
+@@ -33,7 +33,7 @@
+ #include <calendar/gui/e-cal-config.h>
+ #include <libedataserver/e-source.h>
+ #include <libedataserver/e-url.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-config.h>
+ #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
+@@ -37,7 +37,7 @@
+ #include <gtk/gtkcellrenderertext.h>
+ #include <libgnomeui/gnome-ui-init.h>
+ #include <libgnome/gnome-init.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-error.h>
+ #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
+@@ -28,7 +28,7 @@
+ #include <gnome.h>
+ #include <gtk/gtk.h>
+ #include <libgnomeui/libgnomeui.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
+ #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
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #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
+@@ -29,7 +29,7 @@
+ #include <e-util/e-config.h>
+ #include <addressbook/gui/widgets/eab-config.h>
+ #include <libedataserver/e-source.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <string.h>
+ 
+ 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
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -40,7 +40,7 @@
+ #include <e-util/e-xml-utils.h>
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <string.h>
+ 
+ #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
+@@ -10,7 +10,7 @@
+ 
+ #include <string.h>
+ #include <gtk/gtkdialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #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
+@@ -23,7 +23,8 @@
+ 
+ #include <config.h>
+ 
+-#include "e-i18n.h"
++#include <glib/gi18n.h>
++
+ #include "e-util-marshal.h"
+ #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
+@@ -1112,20 +1112,6 @@
+ 	}
+ }
+ 
+-char *
+-e_gettext (const char *msgid)
+-{
+-	static gboolean initialized = FALSE;
+-
+-	if (!initialized) {
+-		bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR);
+-		bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8");
+-		initialized = TRUE;
+-	}        
+-
+-	return dgettext (E_I18N_DOMAIN, msgid);
+-}
+-
+ cairo_font_options_t *
+ 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
+@@ -42,7 +42,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -36,155 +36,14 @@
+ #include <string.h>
+ 
+ #include <glib.h>
++#include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ 
+-#include "e-i18n.h"
+ #include "e-util.h"
+ #include "e-xml-utils.h"
+ 
+-/* Returns the first child with the name child_name and the "lang"
+- * attribute that matches the current LC_MESSAGES, or else, the first
+- * child with the name child_name and no "lang" attribute.
+- */
+-xmlNode *
+-e_xml_get_child_by_name_by_lang (const xmlNode *parent,
+-				 const xmlChar *child_name,
+-				 const gchar *lang)
+-{
+-#ifdef G_OS_WIN32
+-	gchar *freeme = NULL;
+-#endif
+-	xmlNode *child;
+-	/* This is the default version of the string. */
+-	xmlNode *C = NULL;
+-
+-	g_return_val_if_fail (parent != NULL, NULL);
+-	g_return_val_if_fail (child_name != NULL, NULL);
+-
+-	if (lang == NULL) {
+-#ifndef G_OS_WIN32
+-#ifdef HAVE_LC_MESSAGES
+-		lang = setlocale (LC_MESSAGES, NULL);
+-#else
+-		lang = setlocale (LC_CTYPE, NULL);
+-#endif
+-#else
+-		lang = freeme = g_win32_getlocale ();
+-#endif
+-	}
+-	for (child = parent->xmlChildrenNode; child != NULL; child = child->next) {
+-		if (xmlStrcmp (child->name, child_name) == 0) {
+-			xmlChar *this_lang = xmlGetProp (child, "lang");
+-			if (this_lang == NULL) {
+-				C = child;
+-			} else if (xmlStrcmp(this_lang, lang) == 0) {
+-#ifdef G_OS_WIN32
+-				g_free (freeme);
+-#endif
+-				return child;
+-			}
+-		}
+-	}
+-#ifdef G_OS_WIN32
+-	g_free (freeme);
+-#endif
+-	return C;
+-}
+-
+-static xmlNode *
+-e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent,
+-						 const gchar *name,
+-						 const GList *lang_list,
+-						 gint *best_lang_score)
+-{
+-	xmlNodePtr best_node = NULL, node;
+-
+-	for (node = parent->xmlChildrenNode; node != NULL; node = node->next) {
+-		xmlChar *lang;
+-
+-		if (node->name == NULL || strcmp (node->name, name) != 0) {
+-			continue;
+-		}
+-		lang = xmlGetProp (node, "xml:lang");
+-		if (lang != NULL) {
+-			const GList *l;
+-			gint i;
+-
+-			for (l = lang_list, i = 0;
+-			     l != NULL && i < *best_lang_score;
+-			     l = l->next, i++) {
+-				if (strcmp ((gchar *) l->data, lang) == 0) {
+-					best_node = node;
+-					*best_lang_score = i;
+-				}
+-			}
+-		} else {
+-			if (best_node == NULL) {
+-				best_node = node;
+-			}
+-		}
+-		xmlFree (lang);
+-		if (*best_lang_score == 0) {
+-			return best_node;
+-		} 
+-	}
+-
+-	return best_node;
+-}
+-
+-/*
+- * e_xml_get_child_by_name_by_lang_list:
+- *
+- */
+-xmlNode *
+-e_xml_get_child_by_name_by_lang_list (const xmlNode *parent,
+-				      const gchar *name,
+-				      const GList *lang_list)
+-{
+-	gint best_lang_score = INT_MAX;
+-
+-	g_return_val_if_fail (parent != NULL, NULL);
+-	g_return_val_if_fail (name != NULL, NULL);
+-
+-	if (lang_list == NULL) {
+-		lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
+-	}
+-	return e_xml_get_child_by_name_by_lang_list_with_score
+-		(parent,name,
+-		 lang_list,
+-		 &best_lang_score);
+-}
+-
+-/*
+- * e_xml_get_child_by_name_no_lang
+- *
+- */
+-xmlNode *
+-e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name)
+-{
+-	xmlNodePtr node;
+-
+-	g_return_val_if_fail (parent != NULL, NULL);
+-	g_return_val_if_fail (name != NULL, NULL);
+-
+-	for (node = parent->xmlChildrenNode; node != NULL; node = node->next) {
+-		xmlChar *lang;
+-
+-		if (node->name == NULL || strcmp (node->name, name) != 0) {
+-			continue;
+-		}
+-		lang = xmlGetProp (node, "xml:lang");
+-		if (lang == NULL) {
+-			return node;
+-		}
+-		xmlFree (lang);
+-	}
+-
+-	return NULL;
+-}
+-
+ gint
+ 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
+@@ -45,7 +45,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -46,7 +46,7 @@
+ #include <gtk/gtkstock.h>
+ 
+ #include <gconf/gconf-client.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ 
+ #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
+@@ -45,7 +45,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -108,7 +108,6 @@
+ 	eggtrayicon.c				\
+ 	eggtrayicon.h				\
+ 	e-bit-array.c				\
+-	e-i18n.h				\
+ 	e-sorter.c				\
+ 	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
+@@ -37,7 +37,7 @@
+ #include <gtk/gtkimage.h>
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkwindow.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-url.h>
+ 
+ #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
+@@ -42,7 +42,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-msgport.h>
+ 
+ #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
+@@ -30,18 +30,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-/* lang set to NULL means use the current locale. */
+-xmlNode *e_xml_get_child_by_name_by_lang             (const xmlNode *parent,
+-                                                      const xmlChar *child_name,
+-                                                      const gchar   *lang);
+-/* lang_list set to NULL means use the current locale. */
+-xmlNode *e_xml_get_child_by_name_by_lang_list        (const xmlNode *parent,
+-                                                      const gchar   *name,
+-                                                      const GList   *lang_list);
+-xmlNode *e_xml_get_child_by_name_no_lang             (const xmlNode *parent,
+-                                                      const gchar   *name);
+-
+-
+ gint     e_xml_get_integer_prop_by_name              (const xmlNode *parent,
+                                                       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
+@@ -1,74 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+-/*
+- * e-i18n.h
+- * Copyright 2000, 2001, Ximian, Inc.
+- *
+- * Authors:
+- *   Chris Lahey <clahey@ximian.com>
+- *
+- * Copied from gnome-i18nP.h, because this header is typically not installed
+- *
+- * This file has to be included before any file from the GNOME libraries
+- * to have this override the definitions that are pulled from the gnome-i18n.h
+- *
+- * the difference is that gnome-i18n.h is used for applications, and this is
+- * used by libraries (because libraries have to use dcgettext instead of
+- * gettext and they need to provide the translation domain, unlike apps).
+- *
+- * So you can just put this after you include config.h
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License, version 2, as published by the Free Software Foundation.
+- *
+- * This library is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Library General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA.
+- */
+-
+-#ifndef __E_I18N_H__
+-#define __E_I18N_H__
+-
+-#include <libgnome/gnome-i18n.h>
+-
+-G_BEGIN_DECLS
+-
+-#ifdef ENABLE_NLS
+-	/* this function is defined in e-util.c */
+-	extern char *e_gettext (const char *msgid);
+-#    undef _
+-#    ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN
+-/* No parentheses allowed here since that breaks string concatenation. */
+-#        define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN
+-#    else
+-/* No parentheses allowed here since that breaks string concatenation. */
+-#        define E_I18N_DOMAIN GETTEXT_PACKAGE
+-#    endif
+-#    define _(String) e_gettext (String)
+-#    ifdef gettext_noop
+-#        define N_(String) gettext_noop (String)
+-#    else
+-#        define N_(String) (String)
+-#    endif
+-#else
+-/* Stubs that do something close enough.  */
+-#    define textdomain(String) (String)
+-#    define gettext(String) (String)
+-#    define dgettext(Domain,Message) (Message)
+-#    define dcgettext(Domain,Message,Type) (Message)
+-#    define bindtextdomain(Domain,Directory) (Domain)
+-#    define _(String) (String)
+-#    define N_(String) (String)
+-/* No parentheses allowed here since that breaks string concatenation. */
+-#    define E_I18N_DOMAIN ""
+-#endif
+-
+-G_END_DECLS
+-
+-#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
+@@ -29,7 +29,7 @@
+ 
+ #include <glib.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <bonobo/bonobo-ui-util.h>
+ 
+ #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
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include "addressbook/printing/e-contact-print-envelope.h"
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog.h>
+ #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
+@@ -32,7 +32,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xmlmemory.h>
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog.h>
+ #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
+@@ -30,7 +30,7 @@
+ #include <gtk/gtkcelllayout.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ 
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libebook/e-book.h>
+ #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
+@@ -35,7 +35,7 @@
+ 
+ #include <libebook/e-destination.h>
+ #include <libebook/e-book.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -33,7 +33,7 @@
+ 
+ #include <libedataserver/e-source-list.h>
+ #include <libedataserverui/e-source-selector.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gtk/gtkscrolledwindow.h>
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtknotebook.h>
+ #include <gtk/gtkwidget.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-window-icon.h>
+ #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
+@@ -24,7 +24,7 @@
+ #include <gtk/gtksignal.h>
+ #include <misc/e-canvas-background.h>
+ #include <misc/e-canvas.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -4,7 +4,7 @@
+ #include <config.h>
+ #include <string.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "eab-marshal.h"
+ #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
+@@ -32,7 +32,7 @@
+ #include "e-util/e-icon-factory.h"
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-url.h>
+ #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
+@@ -13,7 +13,7 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "gal-view-factory-minicard.h"
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -25,7 +25,7 @@
+ #include <gtk/gtkdnd.h>
+ #include <gtk/gtkmain.h>
+ #include <gdk/gdkkeysyms.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ #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
+@@ -26,7 +26,7 @@
+ 
+ #include <gtk/gtksignal.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-util.h>
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtkdnd.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <misc/e-canvas.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <string.h>
+ #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
+@@ -24,7 +24,7 @@
+ #include <e-util/e-icon-factory.h>
+ #include <e-util/e-util-private.h>
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -33,7 +33,7 @@
+ #include <gtk/gtktable.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkstock.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-app.h>
+ #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
+@@ -26,7 +26,7 @@
+ #include <e-util/e-util-private.h>
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <gtk/gtkstock.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include "e-contact-editor-im.h"
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -37,7 +37,7 @@
+ #include <gtk/gtklabel.h>
+ #include <libgnomeui/gnome-window-icon.h>
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -63,7 +63,7 @@
+ 
+ #include <libgnome/gnome-exec.h>
+ #include <libgnome/gnome-help.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-uidefs.h>
+ #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
+@@ -41,7 +41,7 @@
+ #endif
+ 
+ #include <libgnomeui/gnome-uidefs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -35,7 +35,7 @@
+ #include <gtk/gtkoptionmenu.h>
+ #include <gtk/gtktooltips.h>
+ #include <libgnomeui/gnome-uidefs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserverui/e-name-selector.h>
+ #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
+@@ -51,7 +51,7 @@
+ #include <bonobo/bonobo-ui-util.h>
+ #include <bonobo/bonobo-widget.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-gconf.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ #include <glib.h>
+ 
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -44,7 +44,7 @@
+ #undef interface
+ #endif
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ 
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtkrc.h>
+ #include <gtk/gtksignal.h>
+ #include <gtk/gtktogglebutton.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ #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
+@@ -148,9 +148,9 @@
+ {
+ 	EShellSettingsDialogPrivate *priv;
+ 	Bonobo_ServerInfoList *control_list;
++	const gchar * const *language_names;
+ 	CORBA_Environment ev;
+-	const GList *l;
+-	GSList *language_list;
++	GSList *languages = NULL;
+ 	GList *page_list;
+ 	GList *p;
+ 	int i, j;
+@@ -168,10 +168,9 @@
+ 
+ 	CORBA_exception_free (&ev);
+ 
+-	/* Great, one uses GList the other GSList (!) */
+-	l = gnome_i18n_get_language_list("LC_MESSAGES");
+-	for (language_list=NULL;l;l=l->next)
+-		language_list = g_slist_append(language_list, l->data);
++	language_names = g_get_language_names ();
++	while (*language_names != NULL)
++		languages = g_list_append (languages, *language_names++);
+ 
+ 	page_list = NULL;
+ 	for (i = 0; i < control_list->_length; i ++) {
+@@ -189,8 +188,8 @@
+ 
+ 		info = & control_list->_buffer[i];
+ 
+-		title       	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list);
+-		description 	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list);
++		title       	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages);
++		description 	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages);
+ 		icon_path   	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL);
+ 		type            = bonobo_server_info_prop_find   (info, "evolution2:config_item:type");
+ 		priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL);
+@@ -232,7 +231,7 @@
+ 
+ 		CORBA_exception_free (&ev);
+ 	}
+-	g_slist_free(language_list);
++	g_slist_free(languages);
+ 
+ 	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
+@@ -36,7 +36,7 @@
+ #include <bonobo/bonobo-exception.h>
+ #include <bonobo/bonobo-control.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -55,7 +55,7 @@
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkstock.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -28,7 +28,7 @@
+ #include "e-util/e-dialog-utils.h"
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -28,7 +28,7 @@
+ #include <glib/gprintf.h>
+ 
+ #include <libgnome/gnome-exec.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-url.h>
+ 
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+@@ -611,10 +611,11 @@
+ {
+ 	char *quickref;
+ 	GnomeVFSMimeApplication *app;
+-	const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
++	const gchar * const *language_names;
+ 
+-	for (; lang_list != NULL; lang_list = lang_list->next) {
+-		const char *lang = lang_list->data;
++	language_names = g_get_language_names ();
++	while (*language_names != NULL) {
++		const gchar *lang = *language_names++;
+ 
+ 		/* 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
+@@ -28,7 +28,7 @@
+ 
+ #include <e-util/e-icon-factory.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #include <bonobo/bonobo-object.h>
+ #include <bonobo/bonobo-exception.h>
+@@ -146,8 +146,9 @@
+ query_components (EComponentRegistry *registry)
+ {
+ 	Bonobo_ServerInfoList *info_list;
++	const gchar * const *language_names;
+ 	CORBA_Environment ev;
+-	GSList *language_list;
++	GSList *languages = NULL;
+ 	const GList *l;
+ 	char *query;
+ 	int i;
+@@ -170,9 +171,9 @@
+ 		return;
+ 	}
+ 
+-	l = gnome_i18n_get_language_list("LC_MESSAGES");
+-	for (language_list=NULL;l;l=l->next)
+-		language_list = g_slist_append(language_list, l->data);
++	language_names = g_get_language_names ();
++	while (*language_names != NULL)
++		languages = g_slist_append (languages, *language_names++);
+ 
+ 	for (i = 0; i < info_list->_length; i++) {
+ 		const char *id;
+@@ -200,13 +201,13 @@
+ 			continue;
+ 		}
+ 
+-		label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list);
++		label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages);
+ 		
+-		tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list);
++		tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages);
+ 
+-		menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list);
++		menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages);
+ 
+-		menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list);
++		menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages);
+ 
+ 		alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL);
+ 
+@@ -235,7 +236,7 @@
+ 			g_object_unref (menuicon);
+ 		bonobo_object_release_unref(iface, NULL);
+ 	}
+-	g_slist_free(language_list);
++	g_slist_free(languages);
+ 
+ 	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
+@@ -33,7 +33,7 @@
+ 
+ #include <glade/glade.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -34,7 +34,7 @@
+ #include <glib.h>
+ #include <gtk/gtkradiobutton.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog.h>
+ #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
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "calendar-view-factory.h"
+ #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
+@@ -27,7 +27,7 @@
+ #include <bonobo/bonobo-exception.h>
+ #include <bonobo/bonobo-object.h>
+ #include <bonobo/bonobo-moniker-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-time-utils.h>
+ #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
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -43,7 +43,7 @@
+ #include <gtk/gtkstock.h>
+ #include <gtk/gtktooltips.h>
+ #include <gtk/gtkversion.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-exec.h>
+ #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
+@@ -33,7 +33,7 @@
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <gtk/gtkmain.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -32,7 +32,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <gtk/gtkmisc.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "e-util/e-categories-config.h"
+ #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
+@@ -34,7 +34,7 @@
+ 
+ #include <time.h>
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -31,7 +31,7 @@
+ #include <bonobo/bonobo-control.h>
+ #include <bonobo/bonobo-widget.h>
+ #include <bonobo/bonobo-exception.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -29,7 +29,7 @@
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkcheckbutton.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "e-cal-model-calendar.h"
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include <string.h>
+ #include <glade/glade.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -33,7 +33,7 @@
+ #include <gtk/gtkspinbutton.h>
+ #include <gtk/gtkoptionmenu.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -36,7 +36,7 @@
+ #include <gtk/gtktreeview.h>
+ #include <gtk/gtktreeselection.h>
+ #include <gtk/gtkoptionmenu.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -34,7 +34,7 @@
+ #include <bonobo/bonobo-ui-util.h>
+ #include <bonobo/bonobo-widget.h>
+ #include <libgnome/libgnome.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs-mime.h>
+ #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
+@@ -39,7 +39,7 @@
+ #include <gtk/gtktreeselection.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkstock.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -31,7 +31,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <gdk/gdkkeysyms.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -29,7 +29,7 @@
+ 
+ #include <string.h>
+ #include <glade/glade.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include <libedataserver/e-source.h>
+ #include <libedataserver/e-source-list.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/libgnomeui.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-uidefs.h>
+ #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
+@@ -26,7 +26,7 @@
+ #include <gtk/gtkstock.h>
+ #include <gtk/gtk.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <e-util/e-icon-factory.h>
+ #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
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <gtk/gtksignal.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-uidefs.h>
+ #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
+@@ -27,7 +27,7 @@
+ 
+ #include <gtk/gtksignal.h>
+ #include <gtk/gtktogglebutton.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -45,7 +45,7 @@
+ #endif
+ 
+ #include <libgnomeui/gnome-uidefs.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ 
+ #include <string.h>
+ #include <glade/glade.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <misc/e-dateedit.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-uidefs.h>
+ #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
+@@ -27,7 +27,7 @@
+ #include <libical/ical.h>
+ #include <glib.h>
+ #include <gtk/gtklabel.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -36,7 +36,7 @@
+ #include <widgets/misc/e-dateedit.h>
+ #include <e-util/e-dialog-widgets.h>
+ #include <e-util/e-util-private.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <string.h>
+ 
+ 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
+@@ -30,7 +30,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkwindow.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomeui/gnome-dialog-util.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -33,7 +33,7 @@
+ #include <gtk/gtkspinbutton.h>
+ #include <gtk/gtkoptionmenu.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ #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
+@@ -51,7 +51,7 @@
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkvscrollbar.h>
+ #include <libgnomeui/gnome-dateedit.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnomecanvas/gnome-canvas-widget.h>
+ 
+ #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
+@@ -47,7 +47,7 @@
+ #include <libgnomeui/gnome-messagebox.h>
+ #include <libgnomeui/gnome-stock-icons.h>
+ #include <libgnome/gnome-util.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <bonobo/bonobo-ui-util.h>
+ #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
+@@ -30,7 +30,7 @@
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkcheckbutton.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -26,7 +26,7 @@
+ #include <ctype.h>
+ #include <time.h>
+ #include <libedataserver/e-url.h>
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -25,7 +25,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-data-server-util.h>
+ #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
+@@ -37,7 +37,7 @@
+ #include <gtk/gtkbox.h>
+ #include <gtk/gtkcontainer.h>
+ #include <gtk/gtkwindow.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-time-utils.h>
+ #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
+@@ -36,7 +36,7 @@
+ #include <string.h>
+ #include <libgnomeui/gnome-messagebox.h>
+ #include <libgnomeui/gnome-stock-icons.h> 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-time-utils.h>
+ #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
+@@ -35,7 +35,7 @@
+ #include <gtk/gtksignal.h>
+ #include <gnome.h>
+ #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "e-timezone-entry.h"
+ #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
+@@ -25,7 +25,7 @@
+ #include <gtk/gtktreemodel.h>
+ #include <gtk/gtksignal.h>
+ #include <gtk/gtktreednd.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -46,7 +46,7 @@
+ #include <misc/e-gui-utils.h>
+ #include <misc/e-unicode.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -24,7 +24,7 @@
+ 
+ #include <string.h>
+ #include <glib/garray.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-time-utils.h>
+ #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
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <gtk/gtksignal.h>
+ #include <gdk/gdkkeysyms.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #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
+@@ -41,7 +41,7 @@
+ #include <gtk/gtkvscrollbar.h>
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkmain.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-exec.h>
+ #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
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "e-cal-model-memos.h"
+ #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
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-init.h>
+ #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
+@@ -29,7 +29,7 @@
+ #include <gtk/gtkmenuitem.h>
+ #include <gtk/gtkoptionmenu.h>
+ #include <gtk/gtksignal.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-categories.h>
+ #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
+@@ -36,7 +36,7 @@
+ #include <gtk/gtksignal.h>
+ #include <gtk/gtkradiomenuitem.h>
+ #include <gtk/gtkcheckmenuitem.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <misc/e-gui-utils.h>
+ #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
+@@ -39,7 +39,7 @@
+ #include <camel/camel-mime-part.h>
+ #include <camel/camel-stream-vfs.h>
+ #include "e-util/e-util.h"
+-#include "e-util/e-i18n.h"
++#include <glib/gi18n.h>
+ #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
+@@ -26,7 +26,7 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -32,7 +32,7 @@
+ 
+ #include <string.h>
+ #include <glib.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include "e-week-view-main-item.h"
+ #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
+@@ -36,7 +36,7 @@
+ #include <glib.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkbindings.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ #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
+@@ -50,7 +50,7 @@
+ #include <table/e-cell-combo.h>
+ #include <misc/e-popup-menu.h>
+ #include <misc/e-cell-date-edit.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-exec.h>
+ #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
+@@ -90,7 +90,7 @@
+ #include "e-util/e-dialog-utils.h"
+ #include "e-util/e-util-private.h"
+ #include <gtk/gtkmessagedialog.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserverui/e-passwords.h>
+ #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
+@@ -62,7 +62,7 @@
+ 
+ #include <time.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserver/e-data-server-util.h>
+ #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
+@@ -63,7 +63,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserverui/e-passwords.h>
+ 
+ #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
+@@ -31,7 +31,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ 
+ #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
+@@ -36,7 +36,7 @@
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtklabel.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ 
+ #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
+@@ -29,7 +29,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libedataserverui/e-passwords.h>
+ 
+ #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
+@@ -30,7 +30,7 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <glade/glade.h>
+ 
+ #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
+@@ -31,7 +31,7 @@
+ 
+ #include <bonobo/bonobo-exception.h>
+ #include <bonobo-activation/bonobo-activation.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-util.h>
+ 
+ typedef struct {
+@@ -39,7 +39,7 @@
+ 	GPtrArray *names;
+ } KillevComponent;
+ 
+-static GSList *languages;
++static GSList *languages = NULL;
+ static GHashTable *components;
+ 
+ static gboolean
+@@ -186,7 +186,7 @@
+ int
+ main (int argc, char **argv)
+ {
+-	const GList *l;
++	const gchar * const *language_names;
+ 
+ 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -196,9 +196,9 @@
+ 			    GNOME_PROGRAM_STANDARD_PROPERTIES,
+ 			    NULL);
+ 
+-	l = gnome_i18n_get_language_list("LC_MESSAGES");
+-	for (languages=NULL;l;l=l->next)
+-		languages = g_slist_append(languages, l->data);
++	language_names = g_get_language_names ();
++	while (*language_names != NULL)
++		languages = g_slist_append (languages, *language_names++);
+ 
+ 	components = g_hash_table_new (g_str_hash, g_str_equal);
+ 
diff --git a/evolution.spec b/evolution.spec
index e71cc44..327c372 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -149,6 +149,15 @@ Patch43: evolution-2.10.0-e-passwords.patch
 # GNOME bug #417999
 Patch44: evolution-2.10.0-e-source-combo-box.patch
 
+# GNOME bug #419469
+Patch45: evolution-2.10.0-shell-main-cleanups.patch
+
+# GNOME bug #419524
+Patch46: evolution-2.10.0-use-glib-i18n.patch
+
+# GNOME bug #418971
+Patch47: evolution-2.10.0-drop-old-glib-support.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -297,6 +306,9 @@ Development files needed for building things which link against evolution.
 %patch42 -p1 -b .view-message-source
 %patch43 -p1 -b .e-passwords
 %patch44 -p1 -b .e-source-combo-box
+%patch45 -p1 -b .shell-main-cleanups
+%patch46 -p1 -b .use-glib-i18n
+%patch47 -p1 -b .drop-old-glib-support
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -370,6 +382,7 @@ CFLAGS="$CFLAGS \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DEDS_DISABLE_DEPRECATED=1 \
+	-DCAMEL_DISABLE_DEPRECATED=1 \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -442,16 +455,21 @@ done
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null
 
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -706,6 +724,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Mar 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-4.fc7
+- Run gtk-update-icon-cache in %post and %postun (RH bug #234018).
+
+* Sat Mar 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-3.fc7
+- Add flag to disable deprecated Camel symbols.
+- Add patch for GNOME bug #419469 (refactor shell/main.c).
+- Add patch for GNOME bug #419524 (use GLib's i18n macros).
+- Add patch for GNOME bug #418971 (drop support for GLib < 2.8).
+
 * Wed Mar 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-2.fc7
 - Add patch for GNOME bug #417999 (use ESourceComboBox).