From cba3097cad7443810117bded371a2e3088a33d12 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 20 Mar 2007 17:23:58 +0000
Subject: ** Fixes bug #419524

2007-03-20  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #419524

	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.

	* e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list):
	* mail/em-migrate.c (emm_setup_initial):
	* shell/e-component-registry.c (query_components):
	* shell/e-shell-settings-dialog.c (load_pages):
	* shell/e-shell-window-commands.c (command_quick_reference):
	* tools/killev.c (main):
	Use g_get_language_names() instead of gnome_i18n_get_language_list().

	* e-util/e-util.c: Remove e_gettext().

	* e-util/Makefile.am: Remove e-i18n.h.


svn path=/trunk/; revision=33319
---
 ChangeLog                                          |  9 +++
 a11y/ChangeLog                                     |  6 ++
 a11y/addressbook/ea-addressbook-view.c             |  2 +-
 a11y/addressbook/ea-minicard-view.c                |  3 +-
 a11y/addressbook/ea-minicard.c                     |  2 +-
 a11y/calendar/ea-cal-view-event.c                  |  2 +-
 a11y/calendar/ea-cal-view.c                        |  2 +-
 a11y/calendar/ea-day-view-main-item.c              |  2 +-
 a11y/calendar/ea-day-view.c                        |  2 +-
 a11y/calendar/ea-gnome-calendar.c                  |  2 +-
 a11y/calendar/ea-jump-button.c                     |  2 +-
 a11y/calendar/ea-week-view-main-item.c             |  2 +-
 a11y/calendar/ea-week-view.c                       |  2 +-
 a11y/e-table/gal-a11y-e-cell-popup.c               |  2 +-
 a11y/e-table/gal-a11y-e-cell-text.c                |  2 +-
 a11y/e-table/gal-a11y-e-cell-toggle.c              |  2 +-
 a11y/e-table/gal-a11y-e-cell-tree.c                |  2 +-
 a11y/e-table/gal-a11y-e-cell.c                     |  2 +-
 a11y/e-table/gal-a11y-e-table-click-to-add.c       |  2 +-
 a11y/widgets/ea-calendar-item.c                    |  2 +-
 addressbook/ChangeLog                              |  6 ++
 addressbook/gui/component/addressbook-config.c     |  2 +-
 addressbook/gui/component/addressbook-migrate.c    |  2 +-
 addressbook/gui/component/addressbook-view.c       |  2 +-
 addressbook/gui/component/addressbook.c            |  2 +-
 addressbook/gui/component/autocompletion-config.c  |  2 +-
 .../gui/contact-editor/e-contact-editor-address.c  |  2 +-
 .../gui/contact-editor/e-contact-editor-fullname.c |  2 +-
 .../gui/contact-editor/e-contact-editor-im.c       |  2 +-
 addressbook/gui/contact-editor/e-contact-editor.c  |  2 +-
 .../gui/contact-editor/e-contact-quick-add.c       |  2 +-
 addressbook/gui/contact-editor/eab-editor.c        |  2 +-
 .../contact-list-editor/e-contact-list-editor.c    |  2 +-
 .../gui/widgets/e-addressbook-reflow-adapter.c     |  2 +-
 addressbook/gui/widgets/e-addressbook-view.c       |  2 +-
 addressbook/gui/widgets/e-minicard-label.c         |  2 +-
 addressbook/gui/widgets/e-minicard-view-widget.c   |  2 +-
 addressbook/gui/widgets/e-minicard-view.c          |  2 +-
 addressbook/gui/widgets/e-minicard.c               |  2 +-
 addressbook/gui/widgets/eab-contact-display.c      |  2 +-
 .../gui/widgets/gal-view-factory-minicard.c        |  2 +-
 .../gui/widgets/gal-view-factory-treeview.c        |  2 +-
 addressbook/printing/e-contact-print-envelope.c    |  2 +-
 addressbook/printing/e-contact-print.c             |  2 +-
 calendar/ChangeLog                                 |  6 ++
 calendar/gui/alarm-notify/alarm-notify-dialog.c    |  2 +-
 calendar/gui/alarm-notify/alarm-queue.c            |  2 +-
 calendar/gui/alarm-notify/notify-main.c            |  2 +-
 calendar/gui/alarm-notify/util.c                   |  2 +-
 calendar/gui/cal-search-bar.c                      |  2 +-
 calendar/gui/calendar-commands.c                   |  2 +-
 calendar/gui/calendar-view-factory.c               |  2 +-
 calendar/gui/dialogs/alarm-list-dialog.c           |  2 +-
 calendar/gui/dialogs/cal-attachment-select-file.c  |  2 +-
 calendar/gui/dialogs/cal-prefs-dialog.c            |  2 +-
 calendar/gui/dialogs/calendar-setup.c              |  2 +-
 calendar/gui/dialogs/cancel-comp.c                 |  2 +-
 calendar/gui/dialogs/changed-comp.c                |  2 +-
 calendar/gui/dialogs/comp-editor-page.c            |  2 +-
 calendar/gui/dialogs/comp-editor-util.c            |  2 +-
 calendar/gui/dialogs/comp-editor.c                 |  2 +-
 calendar/gui/dialogs/delete-comp.c                 |  2 +-
 calendar/gui/dialogs/delete-error.c                |  2 +-
 calendar/gui/dialogs/event-editor.c                |  2 +-
 calendar/gui/dialogs/event-page.c                  |  2 +-
 calendar/gui/dialogs/memo-editor.c                 |  2 +-
 calendar/gui/dialogs/memo-page.c                   |  2 +-
 calendar/gui/dialogs/recur-comp.c                  |  2 +-
 calendar/gui/dialogs/recurrence-page.c             |  2 +-
 calendar/gui/dialogs/schedule-page.c               |  2 +-
 calendar/gui/dialogs/task-details-page.c           |  2 +-
 calendar/gui/dialogs/task-editor.c                 |  2 +-
 calendar/gui/dialogs/task-page.c                   |  2 +-
 calendar/gui/e-alarm-list.c                        |  2 +-
 calendar/gui/e-cal-list-view.c                     |  2 +-
 calendar/gui/e-cal-model-calendar.c                |  2 +-
 calendar/gui/e-cal-model-memos.c                   |  2 +-
 calendar/gui/e-cal-model-tasks.c                   |  2 +-
 calendar/gui/e-cal-model.c                         |  2 +-
 calendar/gui/e-cal-popup.c                         |  2 +-
 calendar/gui/e-calendar-view.c                     |  2 +-
 calendar/gui/e-cell-date-edit-text.c               |  2 +-
 calendar/gui/e-day-view-time-item.c                |  2 +-
 calendar/gui/e-day-view-top-item.c                 |  2 +-
 calendar/gui/e-day-view.c                          |  2 +-
 calendar/gui/e-itip-control.c                      |  2 +-
 calendar/gui/e-meeting-list-view.c                 |  2 +-
 calendar/gui/e-meeting-store.c                     |  2 +-
 calendar/gui/e-meeting-time-sel-item.c             |  2 +-
 calendar/gui/e-meeting-time-sel.c                  |  2 +-
 calendar/gui/e-pub-utils.c                         |  2 +-
 calendar/gui/e-timezone-entry.c                    |  2 +-
 calendar/gui/e-week-view-main-item.c               |  2 +-
 calendar/gui/e-week-view.c                         |  2 +-
 calendar/gui/gnome-cal.c                           |  2 +-
 calendar/gui/itip-utils.c                          |  2 +-
 calendar/gui/main.c                                |  2 +-
 calendar/gui/memos-control.c                       |  2 +-
 calendar/gui/misc.c                                |  2 +-
 calendar/gui/print.c                               |  2 +-
 calendar/gui/tasks-control.c                       |  2 +-
 calendar/gui/weekday-picker.c                      |  2 +-
 composer/ChangeLog                                 |  6 ++
 composer/e-msg-composer-attachment-bar.c           |  2 +-
 composer/e-msg-composer-attachment.c               |  2 +-
 composer/e-msg-composer-hdrs.c                     |  2 +-
 composer/e-msg-composer-select-file.c              |  2 +-
 composer/e-msg-composer.c                          |  2 +-
 e-util/ChangeLog                                   | 13 ++++
 e-util/Makefile.am                                 |  1 -
 e-util/e-categories-config.c                       |  2 +-
 e-util/e-config.c                                  |  2 +-
 e-util/e-dialog-utils.c                            |  2 +-
 e-util/e-error.c                                   |  2 +-
 e-util/e-event.c                                   |  2 +-
 e-util/e-i18n.h                                    | 74 ----------------------
 e-util/e-import.c                                  |  2 +-
 e-util/e-menu.c                                    |  2 +-
 e-util/e-popup.c                                   |  2 +-
 e-util/e-text-event-processor.c                    |  3 +-
 e-util/e-util.c                                    | 15 -----
 e-util/e-xml-utils.c                               |  8 ++-
 filter/ChangeLog                                   |  6 ++
 filter/filter-datespec.c                           |  2 +-
 filter/filter-file.c                               |  2 +-
 filter/filter-input.c                              |  2 +-
 filter/filter-label.c                              |  2 +-
 filter/filter-option.c                             |  2 +-
 filter/filter-part.c                               |  2 +-
 filter/filter-rule.c                               |  2 +-
 filter/rule-context.c                              |  2 +-
 filter/rule-editor.c                               |  2 +-
 mail/ChangeLog                                     |  9 +++
 mail/em-account-editor.c                           |  2 +-
 mail/em-account-prefs.c                            |  2 +-
 mail/em-composer-utils.c                           |  2 +-
 mail/em-filter-editor.c                            |  2 +-
 mail/em-filter-folder-element.c                    |  2 +-
 mail/em-filter-rule.c                              |  2 +-
 mail/em-folder-properties.c                        |  2 +-
 mail/em-folder-selection-button.c                  |  2 +-
 mail/em-folder-selector.c                          |  2 +-
 mail/em-folder-tree-model.c                        |  2 +-
 mail/em-folder-tree.c                              |  2 +-
 mail/em-folder-utils.c                             |  2 +-
 mail/em-format-hook.c                              |  2 +-
 mail/em-format-html-display.c                      |  2 +-
 mail/em-format-html.c                              |  2 +-
 mail/em-format-quote.c                             |  2 +-
 mail/em-format.c                                   |  2 +-
 mail/em-migrate.c                                  | 35 +++++-----
 mail/em-popup.c                                    |  2 +-
 mail/em-subscribe-editor.c                         |  2 +-
 mail/em-utils.c                                    |  2 +-
 mail/em-vfolder-editor.c                           |  2 +-
 mail/em-vfolder-rule.c                             |  2 +-
 mail/importers/evolution-outlook-importer.c        |  2 +-
 mail/importers/mail-importer.c                     |  2 +-
 mail/mail-autofilter.c                             |  2 +-
 mail/mail-component.c                              |  2 +-
 mail/mail-folder-cache.c                           |  2 +-
 mail/mail-mt.c                                     |  2 +-
 mail/mail-ops.c                                    |  2 +-
 mail/mail-send-recv.c                              |  2 +-
 mail/mail-tools.c                                  |  2 +-
 mail/mail-vfolder.c                                |  2 +-
 mail/message-list.c                                |  2 +-
 mail/message-tag-followup.c                        |  2 +-
 plugins/backup-restore/ChangeLog                   |  6 ++
 plugins/backup-restore/backup-restore.c            |  2 +-
 plugins/backup-restore/backup.c                    |  2 +-
 plugins/bbdb/ChangeLog                             |  6 ++
 plugins/bbdb/bbdb.c                                |  2 +-
 plugins/bbdb/gaimbuddies.c                         |  2 +-
 plugins/calendar-file/ChangeLog                    |  6 ++
 plugins/calendar-file/calendar-file.c              |  2 +-
 plugins/calendar-http/ChangeLog                    |  6 ++
 plugins/calendar-http/calendar-http.c              |  2 +-
 plugins/calendar-weather/ChangeLog                 |  6 ++
 plugins/calendar-weather/calendar-weather.c        |  2 +-
 plugins/default-source/ChangeLog                   |  6 ++
 plugins/default-source/default-source.c            |  2 +-
 plugins/exchange-operations/ChangeLog              |  6 ++
 .../exchange-operations/exchange-send-options.c    |  2 +-
 plugins/groupwise-features/ChangeLog               |  6 ++
 plugins/groupwise-features/addressbook-groupwise.c |  2 +-
 plugins/groupwise-features/install-shared.c        |  2 +-
 plugins/groupwise-features/junk-settings.c         |  2 +-
 plugins/groupwise-features/process-meeting.c       |  2 +-
 plugins/groupwise-features/send-options.c          |  2 +-
 plugins/groupwise-features/share-folder-common.c   |  2 +-
 plugins/import-ics-attachments/ChangeLog           |  6 ++
 plugins/import-ics-attachments/icsimporter.c       |  2 +-
 plugins/itip-formatter/ChangeLog                   |  6 ++
 plugins/itip-formatter/itip-formatter.c            |  2 +-
 plugins/itip-formatter/itip-view.c                 |  2 +-
 plugins/mark-all-read/ChangeLog                    |  6 ++
 plugins/mark-all-read/mark-all-read.c              |  2 +-
 plugins/publish-calendar/ChangeLog                 |  6 ++
 plugins/publish-calendar/publish-calendar.c        |  2 +-
 plugins/subject-thread/ChangeLog                   |  6 ++
 plugins/subject-thread/subject-thread.c            |  2 +-
 shell/ChangeLog                                    | 11 ++++
 shell/e-component-registry.c                       | 21 +++---
 shell/e-shell-folder-title-bar.c                   |  2 +-
 shell/e-shell-importer.c                           |  2 +-
 shell/e-shell-settings-dialog.c                    | 17 +++--
 shell/e-shell-utils.c                              |  2 +-
 shell/e-shell-window-commands.c                    |  9 +--
 shell/e-shell-window.c                             |  2 +-
 shell/e-shell.c                                    |  2 +-
 shell/e-user-creatable-items-handler.c             |  2 +-
 shell/evolution-shell-component-utils.c            |  2 +-
 shell/importer/intelligent.c                       |  2 +-
 shell/main.c                                       |  2 +-
 smime/ChangeLog                                    |  6 ++
 smime/gui/ca-trust-dialog.c                        |  2 +-
 smime/gui/cert-trust-dialog.c                      |  2 +-
 smime/gui/certificate-manager.c                    |  2 +-
 smime/gui/certificate-viewer.c                     |  2 +-
 smime/gui/component.c                              |  2 +-
 smime/gui/e-cert-selector.c                        |  2 +-
 smime/lib/e-cert-db.c                              |  2 +-
 smime/lib/e-cert.c                                 |  2 +-
 smime/lib/e-pkcs12.c                               |  2 +-
 tools/evolution-launch-composer.c                  |  2 +-
 tools/killev.c                                     | 12 ++--
 widgets/ChangeLog                                  |  8 ++-
 widgets/menus/gal-define-views-dialog.c            |  6 +-
 widgets/menus/gal-define-views-model.c             |  2 +-
 widgets/menus/gal-view-collection.c                |  2 +-
 widgets/menus/gal-view-factory-etable.c            |  2 +-
 widgets/menus/gal-view-instance-save-as-dialog.c   |  6 +-
 widgets/menus/gal-view-instance.c                  |  2 +-
 widgets/menus/gal-view-menus.c                     |  2 +-
 widgets/menus/gal-view-new-dialog.c                |  4 +-
 widgets/misc/ChangeLog                             |  6 ++
 widgets/misc/e-activity-handler.c                  |  2 +-
 widgets/misc/e-attachment-bar.c                    |  2 +-
 widgets/misc/e-attachment.c                        |  2 +-
 widgets/misc/e-calendar-item.c                     |  2 +-
 widgets/misc/e-calendar.c                          |  2 +-
 widgets/misc/e-canvas-background.c                 |  2 +-
 widgets/misc/e-canvas-vbox.c                       |  2 +-
 widgets/misc/e-cell-date-edit.c                    |  2 +-
 widgets/misc/e-cell-percent.c                      |  2 +-
 widgets/misc/e-charset-picker.c                    |  2 +-
 widgets/misc/e-clipped-label.c                     |  2 +-
 widgets/misc/e-dateedit.c                          |  2 +-
 widgets/misc/e-filter-bar.c                        |  2 +-
 widgets/misc/e-image-chooser.c                     |  2 +-
 widgets/misc/e-map.c                               |  2 +-
 widgets/misc/e-pilot-settings.c                    |  2 +-
 widgets/misc/e-reflow.c                            |  2 +-
 widgets/misc/e-search-bar.c                        |  2 +-
 widgets/misc/e-selection-model-array.c             |  2 +-
 widgets/misc/e-selection-model.c                   |  2 +-
 widgets/misc/e-send-options.c                      |  2 +-
 widgets/misc/e-task-widget.c                       |  2 +-
 widgets/misc/e-unicode.c                           |  2 +-
 widgets/misc/test-color.c                          |  2 +-
 widgets/table/ChangeLog                            |  6 ++
 widgets/table/e-cell-combo.c                       |  2 +-
 widgets/table/e-cell-date.c                        |  2 +-
 widgets/table/e-cell-float.c                       |  2 +-
 widgets/table/e-cell-number.c                      |  2 +-
 widgets/table/e-cell-pixbuf.c                      |  2 +-
 widgets/table/e-cell-text.c                        |  2 +-
 widgets/table/e-table-click-to-add.c               |  2 +-
 widgets/table/e-table-col.c                        |  2 +-
 widgets/table/e-table-config-field.c               |  2 +-
 widgets/table/e-table-config.c                     |  8 +--
 widgets/table/e-table-field-chooser-dialog.c       |  2 +-
 widgets/table/e-table-field-chooser-item.c         |  2 +-
 widgets/table/e-table-field-chooser.c              |  4 +-
 widgets/table/e-table-group-container.c            |  2 +-
 widgets/table/e-table-group-leaf.c                 |  2 +-
 widgets/table/e-table-header-item.c                |  6 +-
 widgets/table/e-table-item.c                       |  2 +-
 widgets/table/e-table-scrolled.c                   |  2 +-
 widgets/table/e-table-selection-model.c            |  2 +-
 widgets/table/e-table-sorter.c                     |  2 +-
 widgets/table/e-table.c                            |  2 +-
 widgets/table/e-tree-scrolled.c                    |  2 +-
 widgets/table/e-tree-selection-model.c             |  2 +-
 widgets/table/e-tree.c                             |  2 +-
 widgets/text/e-completion-view.c                   |  4 +-
 widgets/text/e-entry-test.c                        |  2 +-
 widgets/text/e-entry.c                             |  2 +-
 widgets/text/e-text.c                              |  2 +-
 290 files changed, 494 insertions(+), 410 deletions(-)
 delete mode 100644 e-util/e-i18n.h

diff --git a/ChangeLog b/ChangeLog
index 952a59ed21..bde1ad5351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* tools/killev.c (main): Use g_get_language_names() instead of
+	gnome_i18n_get_language_list().
+
 2007-03-12  Harish Krishnaswamy <kharish@novell.com>
 
 	* NEWS, configure.in: Evolution 2.10 release updates
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 44f8dab51c..255a874e3e 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/i18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-01  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-table/gal-a11y-e-cell-tree.c: (kill_view_cb),
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index 1d26767a79..21449f3d8f 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -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);
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index 6ed202b867..0ecef175b4 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -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"
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
index 2bde576ab3..0bd1bd269c 100644
--- a/a11y/addressbook/ea-minicard.c
+++ b/a11y/addressbook/ea-minicard.c
@@ -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"
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 187531ce7c..9603c28dc3 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -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);
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index 6a25455410..e357fc1a90 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -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);
 
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index 4912e6ee7a..f3f43c9a6f 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -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);
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index d10deb49bd..a1e842de9b 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -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);
 
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
index 87bc568310..60ebde386d 100644
--- a/a11y/calendar/ea-gnome-calendar.c
+++ b/a11y/calendar/ea-gnome-calendar.c
@@ -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);
 
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
index d9bab31943..7dbaaa9851 100644
--- a/a11y/calendar/ea-jump-button.c
+++ b/a11y/calendar/ea-jump-button.c
@@ -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);
 
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
index 490c235446..deb4f6d3d4 100644
--- a/a11y/calendar/ea-week-view-main-item.c
+++ b/a11y/calendar/ea-week-view-main-item.c
@@ -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);
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index a524c5bd6a..52ecafcbcf 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -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);
 
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 8d5e40d70e..9b36f0903b 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -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"
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index e1a485cd55..d751af1452 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -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"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 7706062908..6d1bbfd45e 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -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"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index b86ecc01bd..06b88652c1 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -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"
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index d6b69a47f3..c19622d2b5 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -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"
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index 9d96f3cf18..819946cbbb 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -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"
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index 0aeac944df..2529cb87b8 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -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"
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3e52a8a4c0..ab9a377ec3 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 6d5d472b2d..60ad21e513 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -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>
 
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index c4516c4b0a..70518239ed 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -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>
 
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 79bf25183e..37cc297f6c 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -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>
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 454bd9f5b9..f1dd9256ef 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -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>
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 0324ad838e..41b2d1924b 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index a039c49a6b..44beddb5ba 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 249ffb38fc..2e4b05b90d 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
index cb807353db..8061d48fcc 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 9926bfc40c..8dab79c465 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index c3b1d3f70e..549b8ecb83 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -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>
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index c6f45a260c..29702bb23a 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -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"
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 3d2ca34648..6fb0791de3 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -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>
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index df4c6a2c36..e2e7edd793 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -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"
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index d8d6c8b5fb..c011f385d3 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -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>
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index f9b5dcbbe7..ef1248494a 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -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>
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index af59205eb8..ff0556e2d3 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -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"
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 34085b4a4a..8ced89cb03 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -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"
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index db0093ec0a..0f8c8d7ad2 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -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>
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 470356d3b9..6962962b0d 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -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>
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index 6e8df82a4a..9fb1e5b0f6 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -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"
 
diff --git a/addressbook/gui/widgets/gal-view-factory-treeview.c b/addressbook/gui/widgets/gal-view-factory-treeview.c
index d983a636d1..bdd875caa8 100644
--- a/addressbook/gui/widgets/gal-view-factory-treeview.c
+++ b/addressbook/gui/widgets/gal-view-factory-treeview.c
@@ -14,7 +14,7 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "gal-view-factory-treeview.h"
 #include "gal-view-treeview.h"
 
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index 38532720fa..1c9b210a97 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -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>
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 6bbb4ca8fb..e3899b8992 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -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>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cfdf9bfb10..6e8897152e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* gui/dialogs/event-page.c: (event_page_fill_component): Set the
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 0c2ec42d7f..99c75066f4 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -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
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d635eb6f74..cd25ada5d5 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -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>
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 141e49e6d5..4b7c563319 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -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>
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 661b0f44c0..f1c694a02f 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -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"
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 6e5751d2cc..7b2efc5de2 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -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>
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 40abe4efaf..ef517f7137 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -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>
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index 53d48e5478..080c7cb387 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -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"
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 15831d8ed9..97f6c02fc3 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -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"
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 3c101f860c..2743f8f9a8 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -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>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 9763ce3e57..38f9ed50a6 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -35,7 +35,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[] = {
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index ab091bcade..4e679054e6 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -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"
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 1c19e734ae..de06b835ec 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -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"
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index a76b123b36..14d27b2424 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -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"
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 22461c5107..8c9d488f4f 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -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"
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index b752e2ac48..038489353c 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -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>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 71678b3dc3..71e31e0515 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -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>
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index c11cb29624..1624b8c30d 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -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"
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index 5932abeab8..cec4b448ac 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -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"
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 39a6cb2789..a8a1c365a2 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -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>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index aa20384f93..c8be07a0a9 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -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-option-menu.h>
 #include "common/authentication.h"
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 081d6aac96..fb977c3a97 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -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>
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 655738894c..15cf4ab83f 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -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-option-menu.h>
 #include <libedataserverui/e-name-selector.h>
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 07cc441326..c28d29e554 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -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"
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index e2696026b2..2ee4f1a410 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -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>
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 8faabbee44..3aeb03b328 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -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>
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index a3fc8a2152..9484add139 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -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>
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 482fb4ef39..35b92bc63b 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -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>
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index de35a55982..c40a7e6f9f 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -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-option-menu.h>
 #include <misc/e-dateedit.h>
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 4b05579abf..5f6a191d0d 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -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>
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index fa41d4cae2..02b414cbe7 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -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>
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index e7af82566e..9e02766a6d 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -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"
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index ba5f8ab067..84bce4bcb0 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -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"
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 863ab224f6..b481c52048 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -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"
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1963ee69c8..19bd29e8f7 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -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"
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 280db93e89..ab12a51ab2 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -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"
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 6ab0e7f908..2ee44b29a6 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -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>
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 4dc56fa7e8..a93c5e3ab3 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -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>
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 88dc12c44d..b15f243e2c 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -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"
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index f628d0ad6a..ea487a1951 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -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>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 23fe92437e..4a31780d61 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -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>
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 997d9b898f..24624aa0a0 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -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>
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 2d06b4b1b4..ff794f1048 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -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>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index b651c96bdb..e9a083fe89 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -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>
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index a2acca67bb..8f08164757 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -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"
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index c8fed9e2e6..dde51f0ccc 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -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>
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
index 27f723a63c..a4e1d245a8 100644
--- a/calendar/gui/e-pub-utils.c
+++ b/calendar/gui/e-pub-utils.c
@@ -28,7 +28,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal-time-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "calendar-config.h"
 #include "common/authentication.h"
 #include "itip-utils.h"
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 04ee657f92..0699826999 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -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>
 
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 85bcc0224a..fa7cf38bf1 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -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"
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b9555a30b9..b9da861609 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -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>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index c400cc1ec2..6a00e4f37c 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -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>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 8cd149419b..b8c5324369 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -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>
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index bc74781ce1..f20e093045 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -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>
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 213e3affb2..3d4fc5182c 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -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>
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 067c4abeea..495ef343fd 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -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"
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e9629c0648..50ef236ac0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -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>
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 8633af8d4e..e81fd85d93 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -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>
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 28454dc983..a94f7d8b5a 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -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"
diff --git a/composer/ChangeLog b/composer/ChangeLog
index eb8fc74ef4..6475dd7a8a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index f44745dd06..83a4545608 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -32,7 +32,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 "e-msg-composer.h"
 #include "e-msg-composer-select-file.h"
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index a8b6b0e726..295c9a26ad 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -39,7 +39,7 @@
 
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <camel/camel.h>
 
 #include "e-util/e-mktemp.h"
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 7be2e385a4..e4d4b046fd 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -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>
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index c9e98c0a8e..e35369bd72 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -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>
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 44233ff406..17a2af7b9e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -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>
 
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 44f2a067d3..2a036e75f5 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,16 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* e-util.c: Remove e_gettext().
+
+	* e-xml-utils.c (e_xml_get_child_by_name_by_lang_list): Use
+	g_get_language_names() instead of gnome_i18n_get_language_list().
+
+	* Makefile.am: Remove e-i18n.h.
+
 2007-03-01  Tor Lillqvist  <tml@novell.com>
 
 	* e-print.c (print_dialog_response)
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index e3c7052cec..75f9809337 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -108,7 +108,6 @@ libeutil_la_SOURCES =				\
 	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     \
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 0bf75f9d5f..16a7671155 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -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>
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 828ebedcd0..11bd5492b3 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -45,7 +45,7 @@
 
 #include <e-util/e-icon-factory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #define d(x) 
 
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 581c24240c..e5fb6429aa 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -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>
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 0fd4ddedb7..7b7ef5dbf0 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -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>
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 99d8876058..235143c883 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -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)
diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h
deleted file mode 100644
index d98afa31c8..0000000000
--- a/e-util/e-i18n.h
+++ /dev/null
@@ -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__ */
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 1a85991463..5a8ad50f0c 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -45,7 +45,7 @@
 
 #include <e-util/e-icon-factory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #define d(x) 
 
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index 8c9438bbdc..7a53c7d4e8 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -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>
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index a49793e9b1..602d59841e 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -42,7 +42,7 @@
 
 #include <e-util/e-icon-factory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #define d(x)
 
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 733ecae11e..c5dc27cc7d 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -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"
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 5d854e0d51..f5e33f04bd 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -46,7 +46,6 @@
 #endif
 
 #include <libedataserver/e-data-server-util.h>
-#include "e-i18n.h"
 #include "e-util.h"
 #include "e-util-private.h"
 
@@ -1112,20 +1111,6 @@ e_strdupv (const gchar **str_array)
 	}
 }
 
-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 ()
 {
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index f761225d8b..5d83247d05 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -40,7 +40,6 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include "e-i18n.h"
 #include "e-util.h"
 #include "e-xml-utils.h"
 
@@ -149,7 +148,12 @@ e_xml_get_child_by_name_by_lang_list (const xmlNode *parent,
 	g_return_val_if_fail (name != NULL, NULL);
 
 	if (lang_list == NULL) {
-		lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
+		const gchar * const *language_names;
+
+		language_names = g_get_language_names ();
+		while (*language_names != NULL)
+			lang_list = g_list_append (
+				lang_list, *language_names++);
 	}
 	return e_xml_get_child_by_name_by_lang_list_with_score
 		(parent,name,
diff --git a/filter/ChangeLog b/filter/ChangeLog
index f3e65de6ed..95e4d1da52 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-02-04  Andre Klapper  <a9016009@gmx.de>
 
 	* filter-rule.c: (get_widget): Add mnemonic to "Find items".
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 0e7ecc43f7..9ebbacfa65 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -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"
diff --git a/filter/filter-file.c b/filter/filter-file.c
index d331c23a72..99e011f077 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -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>
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 36bf40a284..de690b2f55 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -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"
diff --git a/filter/filter-label.c b/filter/filter-label.c
index 52d6021886..6abb84eb01 100644
--- a/filter/filter-label.c
+++ b/filter/filter-label.c
@@ -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>
diff --git a/filter/filter-option.c b/filter/filter-option.c
index c1fe0f4caa..79878711dc 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -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"
diff --git a/filter/filter-part.c b/filter/filter-part.c
index d09381ae9d..3f1b19b542 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -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"
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 2bc94a3999..a8dc020ab9 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -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"
diff --git a/filter/rule-context.c b/filter/rule-context.c
index b984b67593..2334862677 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -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>
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 9a24089ff4..28e44f862a 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -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"
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9260dcf6c4..b51720be54 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* em-migrate.c (emm_setup_initial): Use g_get_language_names()
+	instead of gnome_i18n_get_language_list().
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 2537ee9225..ced74400dd 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -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>
 
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index f49ff4009a..7e31d637b3 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -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"
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 39824109bf..0334783f95 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -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"
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 49837c775f..7d98a96583 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -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"
 
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index e2f0b81b9f..3b82969b93 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -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"
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index f782f8827b..a5a9782f07 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -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"
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 3b7fe1244e..a278fa3b43 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -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"
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 58712a9f76..575a637443 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -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"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 9aebc55385..42453837fb 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -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>
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index ec4069a6d0..2467b71a7c 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -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>
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 234510f6cf..c6eed2f54b 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -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>
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index ff5947bcdd..43f7b83ae4 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -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>
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 62bab84957..b40c70b158 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -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 */
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 0dafa172d0..fa5c05bda0 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -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>
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 603ec21044..b9bb3b8673 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -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>
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 282fc113b4..87fccaba55 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -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"
diff --git a/mail/em-format.c b/mail/em-format.c
index 54729c2303..32fc1d0b91 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -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>
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 723561ec21..85887fb5e4 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -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 @@ emm_setup_initial(const char *evolution_dir)
 {
 	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) {
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 13d85df201..833da13696 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -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"
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 45e1c47251..0f63800efa 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -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>
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0c6945444a..6c34fb624d 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -59,7 +59,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"
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index e1b78381c2..ea0c7149bb 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -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"
 
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 19510f389a..a796f2635d 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -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"
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 04f14bfc01..e9f1f64f86 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -43,7 +43,7 @@
 #include <gtk/gtkprogressbar.h>
 
 #include <bonobo/bonobo-control.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-exception.h>
 #include <camel/camel-folder.h>
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 753c1eb754..df50c68dfb 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -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>
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index e492fd4df9..4405b761ff 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -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>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 585c5b20fc..efeb17dab3 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -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>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 598141657e..4b83b960b2 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -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>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 3b77496d07..4be57aaea4 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -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>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 71e1bfedc9..8cff6f8661 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -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>
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 2fc91f6f53..4ba64d6052 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -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"
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index cedf4a01c7..85b149df1b 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -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>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 727ed89866..5b68e4e019 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -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>
diff --git a/mail/message-list.c b/mail/message-list.c
index 55a840ad80..2634abadeb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -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>
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index b721134161..a9cec6eb25 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -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"
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index e9d323a741..5df769d8e2 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2005-05-11  Not Zed  <NotZed@Ximian.com>
 
 	* Makefile.am: setup built_sources & cleanfiles.
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 7344806e83..31b69d9915 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -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);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 9048ee2928..dab7bbd35a 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -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
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 1302df7882..2877876382 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gaimbuddies.c: (bbdb_sync_buddy_list_check): Don't leak
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 06b0289455..0145f63a78 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -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>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index e98dadaeb1..7661c6e6cf 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -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>
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index f99c80cd47..a98c581934 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-02-28  Christian Kellner  <gicmo@gnome.org>
 
 	* calendar-file.c: fixing a leak.
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 46aad63788..a673f598e5 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -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);
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index d83bf9026c..16968f8182 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-01-16  Tony Tsui  <tsui.tony@gmail.com>
 
 	Fixes #267402
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index 412a9c0107..755f13db2d 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -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);
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index eba572420f..8f8bf6f8bd 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2005-07-13  Tor Lillqvist  <tml@novell.com>
 
 	* calendar-weather.c (e_calendar_weather_migrate): Don't return a
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 8fe917ba7f..4f5f4a1040 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -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>
diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog
index d189345125..f8125968ff 100644
--- a/plugins/default-source/ChangeLog
+++ b/plugins/default-source/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-10-21  Priit Laes  <amd@store20.com>
 
 	* org-gnome-default-source.eplug.xml: Fix typo. Fixes #363999.
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index a7392f25f9..7cf0a47965 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -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);
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 4e470410e1..4ebbabbb4d 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* exchange-account-setup.c:
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 9215c42e8c..0c9d405875 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -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"
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index c00b8bea1a..0c80f4b065 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-02-05  Sankar P  <psankar@novell.com>
 
         * junk-settings.c:
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index 1cd1691afb..1db534a24d 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -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);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 3455f6e5d2..3f5dbb5ddd 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -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>
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 86589d9df8..b5c63ba135 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -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>
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 91f0384ee7..70a7099288 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -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>
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index c98c0f940a..0e46c91219 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -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"
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index e4e32304e7..584dc7ae15 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -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>
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index a6f2ee81f0..fecf14f5ee 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-11-28  Parthasarathi Susarla <ajaysusarla@gmail.com>
 	
 	** Fix bug #348679
diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 1ffaa563de..4300c1216c 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -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>
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 0587816aee..99928d30b5 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-02-09  Sankar P  <psankar@novell.com>
 
 	* itip-formatter.c: (update_item), (view_response_cb):
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 27896c1a54..b91e19bcb8 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -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>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 6920347485..0a20ea43d3 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -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>
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index db87c66748..ec90d2604e 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-07-04  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* org-gnome-mark-all-read.eplug.xml: Using proper header
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index fc4c558b0e..872a3565e4 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -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>
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 7d2c4b360b..b2e5b7be55 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-02-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #238093 (bnc)
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 4184d1b369..6bba0876c0 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -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>
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 8b2cd985b9..9f2b8f741a 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2005-05-12  Not Zed  <NotZed@Ximian.com>
 
 	* Makefile.am: setup built_sources/cleanfiles
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 870ba02f5b..a412b08ec5 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -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>
diff --git a/shell/ChangeLog b/shell/ChangeLog
index dc1935ddda..b0682dc140 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* e-component-registry.c (query_components):
+	* e-shell-settings-dialog.c (load_pages):
+	* e-shell-window-commands.c (command_quick_reference):
+	Use g_get_language_names() instead of gnome_i18n_get_language_list().
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #419469 - Miscellaneous main.c cleanups
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 12ccd82c5a..d4a9411490 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -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 @@ static void
 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 @@ query_components (EComponentRegistry *registry)
 		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 @@ query_components (EComponentRegistry *registry)
 			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 @@ query_components (EComponentRegistry *registry)
 			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);
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index db0e9d4d41..b681311b78 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -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"
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 8b9bb72b13..29946319be 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -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>
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 8d72da9291..67dc214b41 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -148,9 +148,9 @@ load_pages (EShellSettingsDialog *dialog)
 {
 	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 @@ load_pages (EShellSettingsDialog *dialog)
 
 	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 @@ load_pages (EShellSettingsDialog *dialog)
 
 		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 @@ load_pages (EShellSettingsDialog *dialog)
 
 		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++) {
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index b5a8b9b25c..361b331333 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -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"
 
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 75749c41a4..010e229775 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -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 @@ command_quick_reference (BonoboUIComponent *uih,
 {
 	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
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f8ecc993e9..0ed77f19fe 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -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>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 9da09fa43c..95eb91078a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -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>
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index 4a29bd35c3..11e859d867 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -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>
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index eceb9e01d9..91c03d4786 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -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>
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index f2f7f6898d..e6130a26e7 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -49,7 +49,7 @@
 
 #include <libgnome/gnome-config.h>
 /*#include <libgnome/gnome-util.h>*/
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-widget.h>
diff --git a/shell/main.c b/shell/main.c
index 66dad4a5cb..b8ac07f92f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -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>
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 918785077e..fa82bf49f5 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* lib/e-asn1-object.c: (build_from_der): Initialize a pointer
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 9278a13537..e2035d5a31 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -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"
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 49efaea83c..d6c62e59c7 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -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"
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 6ae1b7f4e2..3db0daf1c3 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -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"
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 1090b5eff3..66f7ab4c1f 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -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"
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 6e424b3c67..5fcd6c0478 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -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"
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 7241d867b6..b6f670e541 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -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>
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index a735d57201..0ca814b2d6 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -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>
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 5403912afa..215b5f492e 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -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? */
 
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index be5d16138a..d67767679e 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -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>
diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c
index ac152dcc20..4d1dd2f4ea 100644
--- a/tools/evolution-launch-composer.c
+++ b/tools/evolution-launch-composer.c
@@ -32,7 +32,7 @@
 
 #include <bonobo/bonobo-main.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-ui-init.h>
 
 #include <libgnomevfs/gnome-vfs-ops.h>
diff --git a/tools/killev.c b/tools/killev.c
index 419b958587..dec1734c0d 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -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 @@ typedef struct {
 	GPtrArray *names;
 } KillevComponent;
 
-static GSList *languages;
+static GSList *languages = NULL;
 static GHashTable *components;
 
 static gboolean
@@ -186,7 +186,7 @@ add_matching_iid (const char *iid)
 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 @@ main (int argc, char **argv)
 			    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/widgets/ChangeLog b/widgets/ChangeLog
index 5ba68eb977..391b928373 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,4 +1,10 @@
-2006-02-08  Matthew Barnes  <mbarnes@redhat.com>
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+2007-02-08  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #357216
 
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index cff8e77750..104e706b6d 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -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 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
 }
 
 /* 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 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 
 	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;
 
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index f526419398..b38dbbc4b2 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -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"
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 4cb1d569b7..848b789235 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -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"
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index bdeb1e1e71..309cf2d5cb 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -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"
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index eb01386418..663097567f 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -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 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 
 	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 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 
 /* 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>"
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index bc92c30169..df84a38948 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -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"
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index c440cb6c27..e6e7a93420 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -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>
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index dee0f78dca..a256baccdb 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -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_init (GalViewNewDialog *dialog)
 					    "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;
 
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 22199488a9..b63c41fac9 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8274df5556..1e4f70eb19 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -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>
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index d39cdf6051..dbb0e7dee2 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -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"
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index b865ce173a..705b5bb2c8 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -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"
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 0dca636875..b46e80ddbb 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -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>
 
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 035dac8a36..7933998445 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -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
 
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 58bda2436d..02f8f1675c 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -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"
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 8ec99ca0af..20562bc039 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -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"
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 8eed38e7f1..f8a4f134a2 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -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>
 
diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c
index 161e476345..76b4ffc06f 100644
--- a/widgets/misc/e-cell-percent.c
+++ b/widgets/misc/e-cell-percent.c
@@ -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"
 
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index f0080d22d5..faaec7225a 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -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>
diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
index b02561c0b7..98e3ecf62e 100644
--- a/widgets/misc/e-clipped-label.c
+++ b/widgets/misc/e-clipped-label.c
@@ -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);
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 5680fc44a9..6061b09f6d 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -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>
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 49abd260e2..1e15a8b539 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -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"
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index cc89ce48d3..7fdb2cb415 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -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"
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 8acbdf5fe6..74359a26ac 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -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"
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
index 1530e972ae..5c0ec29579 100644
--- a/widgets/misc/e-pilot-settings.c
+++ b/widgets/misc/e-pilot-settings.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include "e-pilot-settings.h"
 
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 0615effe6d..594ea1f87b 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -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"
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 889f068eeb..6b20492e43 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -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>
 
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 834f473722..3f91ba42cc 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -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"
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 09430de9f5..21eba118f2 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -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"
 
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 644d054905..f0c6fe42a1 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -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>
 
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index 46e69342e6..2f591ab49f 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtktooltips.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 
 #define SPACING 2
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 7ffe7e44f9..6bf1fdaaec 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -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
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 492cb65c3c..25aeda0f2c 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -24,7 +24,7 @@
 
 #include <gnome.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "color-palette.h"
 #include "e-colors.h"
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index f0c226a1dc..ee35f6e2e7 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 013574475c..629a3588ed 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -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"
 
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 138868db12..d2319ee61e 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -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"
 
diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c
index ce7f5e0630..2ab6111a33 100644
--- a/widgets/table/e-cell-float.c
+++ b/widgets/table/e-cell-float.c
@@ -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"
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index b2ab40590d..e32eca7fe3 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -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"
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 1d9967d23b..22d92bf98a 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -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"
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index ca28e1fbca..25a00085f8 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -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"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index a338df9cc5..b58d027978 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -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"
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 4983f70f15..b61d5b44cf 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -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"
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index af83f40c6a..d49cf08b53 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-table-config-field.h"
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index d7553e8804..f32f09cd21 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -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 @@ create_global_store (ETableConfig *config)
 	}
 }
 
-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 @@ setup_gui (ETableConfig *config)
 			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);
 	}
 
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 9845dd7fbc..db02b7eb83 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -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"
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 6742483fd6..3a94645550 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -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"
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 786e0420b7..294d90e212 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -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 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 	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;
 
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index b67b76e217..3a21171d1c 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -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"
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 315ae0302a..9acf976021 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -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"
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index a11338d6c7..15890b17b7 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -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_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 						 ((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_event (GnomeCanvasItem *item, GdkEvent *e)
 								 ((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",
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 0936c03f31..221abb2044 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -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"
diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index fc31f0eef6..3d581cd8c2 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -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"
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index bdce7741c3..a16285c392 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -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"
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 0e74b6b2cf..3874f29bb1 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -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"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 2a3f37570f..b42d860779 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -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"
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index 953009ea1e..1f1145065f 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -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"
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 1a9cac548a..6e69615aeb 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -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"
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index c3be4f0c24..f6679e59b3 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -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"
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index e7606fc805..57d02bb865 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -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 @@ end_completion_cb (ECompletion *completion, gpointer user_data)
 /* 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\"/> "
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
index 42a24bd567..efb8d47f40 100644
--- a/widgets/text/e-entry-test.c
+++ b/widgets/text/e-entry-test.c
@@ -25,7 +25,7 @@
 
 #include <gnome.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util-private.h"
 
 #include "e-entry.h"
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index f0653a39b6..d5f7cb4fe9 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -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"
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index a1ad01e7c1..0ae2d2203d 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -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"
 
-- 
cgit v1.2.3