Use new glib gi18n.h instead of bonobo's bonobo-i18n.h.

2003-11-05  Christian Persch  <chpe@cvs.gnome.org>

	* embed/downloader-view.c:
	* embed/ephy-embed-popup-control.c:
	* embed/ephy-encodings.c:
	* embed/ephy-history.c:
	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/FilePicker.cpp:
	* lib/eel-gconf-extensions.c:
	* lib/egg/egg-editable-toolbar.c:
	* lib/ephy-file-helpers.c:
	* lib/ephy-gui.c:
	* lib/ephy-langs.c:
	* lib/ephy-node.c:
	* lib/ephy-zoom.h:
	* lib/widgets/ephy-cell-renderer-progress.c:
	* lib/widgets/ephy-zoom-action.c:
	* lib/widgets/ephy-zoom-control.c:
	* src/bookmarks/ephy-bookmark-action.c:
	* src/bookmarks/ephy-bookmark-properties.c:
	* src/bookmarks/ephy-bookmarks-editor.c:
	* src/bookmarks/ephy-bookmarks-import.c:
	* src/bookmarks/ephy-bookmarks-menu.c:
	* src/bookmarks/ephy-bookmarks.c:
	* src/bookmarks/ephy-new-bookmark.c:
	* src/bookmarks/ephy-topic-action.c:
	* src/ephy-encoding-dialog.c:
	* src/ephy-encoding-menu.c:
	* src/ephy-go-action.c:
	* src/ephy-history-window.c:
	* src/ephy-notebook.c:
	* src/ephy-shell.c:
	* src/ephy-tab.c:
	* src/ephy-toolbars-model.c:
	* src/ephy-window.c:
	* src/pdm-dialog.c:
	* src/popup-commands.c:
	* src/ppview-toolbar.c:
	* src/prefs-dialog.c:
	* src/session.c:
	* src/toolbar.c:
	* src/window-commands.c:

	Use new glib gi18n.h instead of bonobo's bonobo-i18n.h.

42 files changed, 87 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c22d6d59..8788ad128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,51 @@
 2003-11-05  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/downloader-view.c:
+	* embed/ephy-embed-popup-control.c:
+	* embed/ephy-encodings.c:
+	* embed/ephy-history.c:
+	* embed/mozilla/ContentHandler.cpp:
+	* embed/mozilla/EphyHeaderSniffer.cpp:
+	* embed/mozilla/FilePicker.cpp:
+	* lib/eel-gconf-extensions.c:
+	* lib/egg/egg-editable-toolbar.c:
+	* lib/ephy-file-helpers.c:
+	* lib/ephy-gui.c:
+	* lib/ephy-langs.c:
+	* lib/ephy-node.c:
+	* lib/ephy-zoom.h:
+	* lib/widgets/ephy-cell-renderer-progress.c:
+	* lib/widgets/ephy-zoom-action.c:
+	* lib/widgets/ephy-zoom-control.c:
+	* src/bookmarks/ephy-bookmark-action.c:
+	* src/bookmarks/ephy-bookmark-properties.c:
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	* src/bookmarks/ephy-bookmarks-import.c:
+	* src/bookmarks/ephy-bookmarks-menu.c:
+	* src/bookmarks/ephy-bookmarks.c:
+	* src/bookmarks/ephy-new-bookmark.c:
+	* src/bookmarks/ephy-topic-action.c:
+	* src/ephy-encoding-dialog.c:
+	* src/ephy-encoding-menu.c:
+	* src/ephy-go-action.c:
+	* src/ephy-history-window.c:
+	* src/ephy-notebook.c:
+	* src/ephy-shell.c:
+	* src/ephy-tab.c:
+	* src/ephy-toolbars-model.c:
+	* src/ephy-window.c:
+	* src/pdm-dialog.c:
+	* src/popup-commands.c:
+	* src/ppview-toolbar.c:
+	* src/prefs-dialog.c:
+	* src/session.c:
+	* src/toolbar.c:
+	* src/window-commands.c:
+
+	Use new glib gi18n.h instead of bonobo's bonobo-i18n.h.
+
+2003-11-05  Christian Persch  <chpe@cvs.gnome.org>
+
 	* data/glade/print.glade:
 	* embed/print-dialog.c: (impl_show), (print_dialog_class_init),
 	(print_dialog_new), (print_dialog_new_with_parent),
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index cd875eb34..b59b9c6a4 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -33,7 +33,7 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeviewcolumn.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <gtk/gtkprogressbar.h>
diff --git a/embed/ephy-embed-popup-control.c b/embed/ephy-embed-popup-control.c
index be4a43fb4..131de477a 100644
--- a/embed/ephy-embed-popup-control.c
+++ b/embed/ephy-embed-popup-control.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkmain.h>
 #include <string.h>
 #include <bonobo/bonobo-ui-component.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkclipboard.h>
 #include <libgnome/gnome-exec.h>
 
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index 51e2d3a52..38f70065a 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -30,7 +30,7 @@
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #define EPHY_ENCODINGS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ENCODINGS, EphyEncodingsPrivate))
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index f318a66a3..871212755 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -29,7 +29,7 @@
 
 #include <time.h>
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
 #define EPHY_HISTORY_XML_ROOT	 "ephy_history"
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index aa5ddc282..17c6685c3 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -38,7 +38,7 @@
 
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 class GContentHandler;
 
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 9ac0c0eca..0b353112b 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -66,7 +66,7 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDownload.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 EphyHeaderSniffer::EphyHeaderSniffer (nsIWebBrowserPersist* aPersist, MozillaEmbedPersist *aEmbedPersist,
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 8b498ede9..f37e31996 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -57,7 +57,7 @@
 #include <gtk/gtkfilefilter.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkmessagedialog.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 
 NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker)
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index ff016b5f5..7ec18f492 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include "eel-gconf-extensions.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
 #include <string.h>
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index b28318ca7..46ab956f3 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -32,7 +32,7 @@
 #include <gtk/gtktoolbar.h>
 #include <gtk/gtktoolitem.h>
 #include <gtk/gtkseparatortoolitem.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 static void egg_editable_toolbar_class_init	(EggEditableToolbarClass *klass);
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index d847ab523..e569805b7 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <glib.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
 #include <libgnome/gnome-exec.h>
 
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 81077d140..293da7c68 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -25,7 +25,7 @@
 
 #include <ctype.h>
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-help.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkmessagedialog.h>
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 5669253e0..dd3cf5133 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -24,7 +24,7 @@
 
 #include "ephy-langs.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 static const EphyFontsLanguageInfo font_languages [] =
 {
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 950033267..51bd0aa5c 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <glib.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h
index 648298fbc..ff047cea9 100644
--- a/lib/ephy-zoom.h
+++ b/lib/ephy-zoom.h
@@ -24,7 +24,7 @@
 #endif
 
 #include <glib.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-cell-renderer-progress.c b/lib/widgets/ephy-cell-renderer-progress.c
index 5e96dc601..7e3ceda25 100644
--- a/lib/widgets/ephy-cell-renderer-progress.c
+++ b/lib/widgets/ephy-cell-renderer-progress.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 #include "ephy-cell-renderer-progress.h"
 
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index e5e04f04e..b1f701d29 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -28,7 +28,7 @@
 #include "ephy-zoom.h"
 
 #include <glib-object.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 #define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate))
 
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 6fe7dd9f6..7349f1578 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtktooltips.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 /**
  * Private data
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 13d2e2f53..b2e17dcb8 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <gtk/gtktoolitem.h>
 
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 745a3f5e5..8201a94f8 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -39,7 +39,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmisc.h>
 #include <gtk/gtkscrolledwindow.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 static void ephy_bookmark_properties_class_init (EphyBookmarkPropertiesClass *klass);
 static void ephy_bookmark_properties_init (EphyBookmarkProperties *editor);
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 6a45eb7cb..17ca97729 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -34,7 +34,7 @@
 #include <gtk/gtkuimanager.h>
 #include <gtk/gtktoggleaction.h>
 #include <gdk/gdkkeysyms.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <string.h>
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 1310ef0f8..c58479922 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 #include "ephy-bookmarks-import.h"
 #include "ephy-debug.h"
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index f5d170155..7548dfce9 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -29,7 +29,7 @@
 
 //#include <libxml/entities.h>
 #include <glib/gprintf.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkuimanager.h>
 
 #define BOOKMARKS_MENU_PATH "/menubar/BookmarksMenu"
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index be3ebe1f9..020eab429 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -35,7 +35,7 @@
 #include "session.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #define EPHY_BOOKMARKS_XML_ROOT    "ephy_bookmarks"
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index dd45aa416..642c073b3 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkeditable.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "ephy-new-bookmark.h"
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 3459a6c1f..2bdc167fc 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <gtk/gtktoolitem.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 #include "ephy-topic-action.h"
 #include "ephy-node-common.h"
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 489ad60f6..02160cf69 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -38,7 +38,7 @@
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkdialog.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 enum
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 1dd2b3a1a..4c5901bf4 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -37,7 +37,7 @@
 #include <gtk/gtktoggleaction.h>
 #include <gtk/gtkradioaction.h>
 #include <gtk/gtkuimanager.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #define EPHY_ENCODING_MENU_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ENCODING_MENU, EphyEncodingMenuPrivate))
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index df68913ca..ffc5951b1 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -24,7 +24,7 @@
 #include "ephy-go-action.h"
 #include "ephy-debug.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtktoolitem.h>
 #include <gtk/gtkbutton.h>
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 2350320be..b541e91bd 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -33,7 +33,7 @@
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkuimanager.h>
 #include <gdk/gdkkeysyms.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
 #include <time.h>
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 14be45a87..1308e71fc 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -47,7 +47,7 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkiconfactory.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
 #define AFTER_ALL_TABS -1
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 9eac44c94..d589c2ad4 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <libgnomeui/gnome-client.h>
 #include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmessagedialog.h>
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 144546f0c..822405d04 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -35,7 +35,7 @@
 #include "session.h"
 #include "ephy-favicon-cache.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkbutton.h>
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 55d351873..c61f66161 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -28,7 +28,7 @@
 #include "ephy-string.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 static void ephy_toolbars_model_class_init (EphyToolbarsModelClass *klass);
 static void ephy_toolbars_model_init       (EphyToolbarsModel *t);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index b921ee502..461134ede 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -47,7 +47,7 @@
 #include "ephy-favicon-cache.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <gtk/gtk.h>
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 8cd0357d4..31afb651f 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcellrenderertext.h>
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 
 typedef struct PdmActionInfo PdmActionInfo;
 
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 7756f9daf..6d8a1c4a7 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -31,7 +31,7 @@
 #include "ephy-file-helpers.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkclipboard.h>
 
 static EphyEmbedEvent *
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index a5caebab0..6532435b6 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -29,7 +29,7 @@
 #include "ephy-gui.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkuimanager.h>
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index f20291cb1..4ec202c77 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -37,7 +37,7 @@
 #include "ephy-encodings.h"
 #include "ephy-debug.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
diff --git a/src/session.c b/src/session.c
index e6042e95a..74c888012 100644
--- a/src/session.c
+++ b/src/session.c
@@ -30,7 +30,7 @@
 #include "ephy-file-helpers.h"
 #include "eel-gconf-extensions.h"
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkimage.h>
diff --git a/src/toolbar.c b/src/toolbar.c
index 5ef026f72..c3ca93b75 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -44,7 +44,7 @@
 #include "ephy-toolbars-model.h"
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtkuimanager.h>
 #include <gtk/gtktoolbar.h>
 
diff --git a/src/window-commands.c b/src/window-commands.c
index 215a1bf48..ab51a8eb0 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-about.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-icon-theme.h>