Index: components/html-editor/dialog.c
===================================================================
--- components/html-editor/dialog.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/dialog.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "dialog.h"
 
 /*
Index: components/html-editor/utils.c
===================================================================
--- components/html-editor/utils.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/utils.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "gtkhtml-compat.h"
 #include "htmlcursor.h"
Index: components/html-editor/gnome-gtkhtml-editor.c
===================================================================
--- components/html-editor/gnome-gtkhtml-editor.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/gnome-gtkhtml-editor.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -2,7 +2,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <gnome.h>
 #include <bonobo.h>
Index: components/html-editor/toolbar.c
===================================================================
--- components/html-editor/toolbar.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/toolbar.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -24,7 +24,7 @@
 /* FIXME: Should use BonoboUIHandler.  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gnome.h>
 #include <bonobo.h>
 
Index: components/html-editor/editor-control-shlib.c
===================================================================
--- components/html-editor/editor-control-shlib.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/editor-control-shlib.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -28,7 +28,7 @@
 #endif
 
 #include <bonobo/bonobo-shlib-factory.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "editor-control-factory.h"
 
Index: components/html-editor/spellchecker.c
===================================================================
--- components/html-editor/spellchecker.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/spellchecker.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "gtkhtml.h"
 #include "gtkhtml-properties.h"
Index: components/html-editor/paragraph.c
===================================================================
--- components/html-editor/paragraph.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/paragraph.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "htmlengine-edit-clueflowstyle.h"
 #include "htmlengine-save.h"
 #include "htmlselection.h"
Index: components/html-editor/engine.c
===================================================================
--- components/html-editor/engine.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/engine.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <bonobo.h>
 
Index: components/html-editor/persist-file.c
===================================================================
--- components/html-editor/persist-file.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/persist-file.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
Index: components/html-editor/rule.c
===================================================================
--- components/html-editor/rule.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/rule.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <glade/glade.h>
 
@@ -169,7 +169,7 @@
 	GtkWidget *rule_page;
 	GladeXML *xml;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "rule_page", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "rule_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
Index: components/html-editor/image.c
===================================================================
--- components/html-editor/image.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/image.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <unistd.h>
 #include <string.h>
 #include <glade/glade.h>
Index: components/html-editor/e-html-utils.c
===================================================================
--- components/html-editor/e-html-utils.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/e-html-utils.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
Index: components/html-editor/text.c
===================================================================
--- components/html-editor/text.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/text.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <glade/glade.h>
 
Index: components/html-editor/menubar.c
===================================================================
--- components/html-editor/menubar.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/menubar.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
Index: components/html-editor/ChangeLog
===================================================================
--- components/html-editor/ChangeLog	(.../upstream/current)	(revision 101)
+++ components/html-editor/ChangeLog	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -1,3 +1,47 @@
+2005-04-23  Changwoo Ryu  <cwryu@debian.org>
+
+	* link.c (link_widget): Specify the translation domain of the
+	glade file.
+	* rule.c (rule_widget): likewise.
+
+	* dialog.c: include <glib/gi18n-lib.h> instead of <glib/gi18n.h>
+	to specify the translation domain explicitly.
+	* utils.c: likewise.
+	* gnome-gtkhtml-editor.c: likewise.
+	* toolbar.c: likewise.
+	* editor-control-shlib.c: likewise.
+	* spellchecker.c: likewise.
+	* paragraph.c: likewise.
+	* engine.c: likewise.
+	* persist-file.c: likewise.
+	* rule.c: likewise.
+	* image.c: likewise.
+	* e-html-utils.c: likewise.
+	* text.c: likewise.
+	* menubar.c: likewise.
+	* persist-file-impl.c: likewise.
+	* gi-color-combo.c: likewise.
+	* html-stream-mem.c: likewise.
+	* htmlsourceview.c: likewise.
+	* persist-stream.c: likewise.
+	* table.c: likewise.
+	* resolver.c: likewise.
+	* popup.c: likewise.
+	* template.c: likewise.
+	* cell.c: likewise.
+	* persist-stream-impl.c: likewise.
+	* test-html-editor-control.c: likewise.
+	* search.c: likewise.
+	* resolver-progressive-impl.c: likewise.
+	* gi-color-palette.c: likewise.
+	* editor-control-factory.c: likewise.
+	* replace.c: likewise.
+	* gi-combo-box.c: likewise.
+	* control-data.c: likewise.
+	* properties.c: likewise.
+	* body.c: likewise.
+	* link.c: likewise.
+
 2005-03-17  Radek Doulik  <rodo@localhost.localdomain>
 
 	* table.c (changed_cols): jump to table,1 and go backward before
Index: components/html-editor/gi-color-combo.c
===================================================================
--- components/html-editor/gi-color-combo.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/gi-color-combo.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -35,7 +35,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "htmlmarshal.h"
 #include "gi-colors.h"
 #include "gi-color-combo.h"
Index: components/html-editor/html-stream-mem.c
===================================================================
--- components/html-editor/html-stream-mem.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/html-stream-mem.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -8,7 +8,7 @@
  * Copyright 2001, Ximian, Inc.
  */
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <gtk/gtk.h>
Index: components/html-editor/htmlsourceview.c
===================================================================
--- components/html-editor/htmlsourceview.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/htmlsourceview.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
Index: components/html-editor/persist-stream.c
===================================================================
--- components/html-editor/persist-stream.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/persist-stream.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "gtkhtml.h"
 #include "persist-stream.h"
Index: components/html-editor/table.c
===================================================================
--- components/html-editor/table.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/table.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <glade/glade.h>
 #include "gi-color-combo.h"
Index: components/html-editor/popup.c
===================================================================
--- components/html-editor/popup.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/popup.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "gtkhtml.h"
 #include "gtkhtml-private.h"
Index: components/html-editor/template.c
===================================================================
--- components/html-editor/template.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/template.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <glade/glade.h>
 
Index: components/html-editor/cell.c
===================================================================
--- components/html-editor/cell.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/cell.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <glade/glade.h>
 #include "gi-color-combo.h"
Index: components/html-editor/test-html-editor-control.c
===================================================================
--- components/html-editor/test-html-editor-control.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/test-html-editor-control.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <gnome.h>
 #include <bonobo.h>
Index: components/html-editor/search.c
===================================================================
--- components/html-editor/search.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/search.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h> 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gnome.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include "search.h"
Index: components/html-editor/gi-color-palette.c
===================================================================
--- components/html-editor/gi-color-palette.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/gi-color-palette.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -32,7 +32,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktable.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <gdk/gdkcolor.h>
Index: components/html-editor/editor-control-factory.c
===================================================================
--- components/html-editor/editor-control-factory.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/editor-control-factory.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include <gnome.h>
 #include <bonobo.h>
Index: components/html-editor/replace.c
===================================================================
--- components/html-editor/replace.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/replace.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gnome.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include "replace.h"
Index: components/html-editor/gi-combo-box.c
===================================================================
--- components/html-editor/gi-combo-box.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/gi-combo-box.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -39,7 +39,7 @@
 #include <gtk/gtktearoffmenuitem.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkcursor.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "gi-combo-box.h"
 #include "gi-utils.h"
 #include "htmlmarshal.h"
Index: components/html-editor/control-data.c
===================================================================
--- components/html-editor/control-data.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/control-data.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "control-data.h"
 #include "spellchecker.h"
 #include "properties.h"
Index: components/html-editor/properties.c
===================================================================
--- components/html-editor/properties.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/properties.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include "dialog.h"
 #include "properties.h"
Index: components/html-editor/body.c
===================================================================
--- components/html-editor/body.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/body.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "gi-color-combo.h"
 #include "htmlengine-edit.h"
Index: components/html-editor/link.c
===================================================================
--- components/html-editor/link.c	(.../upstream/current)	(revision 101)
+++ components/html-editor/link.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glade/glade.h>
 
 #include "htmlcolor.h"
@@ -177,7 +177,7 @@
 	GtkWidget *link_page, *button;
 	GladeXML *xml;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "link_page", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "link_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
Index: configure.in
===================================================================
--- configure.in	(.../upstream/current)	(revision 101)
+++ configure.in	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -24,6 +24,8 @@
 
 GNOME_EXPLICIT_TRANSLATION_DOMAIN=${GTKHTML_RELEASE_STRING}
 AC_DEFINE_UNQUOTED(GNOME_EXPLICIT_TRANSLATION_DOMAIN, "${GNOME_EXPLICIT_TRANSLATION_DOMAIN}", [Gnome Explicit Translation Domain])
+BONOBO_EXPLICIT_TRANSLATION_DOMAIN=${GTKHTML_RELEASE_STRING}
+AC_DEFINE_UNQUOTED(BONOBO_EXPLICIT_TRANSLATION_DOMAIN, "${BONOBO_EXPLICIT_TRANSLATION_DOMAIN}", [Bonobo Explicit Translation Domain])
 
 AM_INIT_AUTOMAKE($PACKAGE, 3.6.2)
 
Index: ChangeLog
===================================================================
--- ChangeLog	(.../upstream/current)	(revision 101)
+++ ChangeLog	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -1,3 +1,9 @@
+2005-04-23  Changwoo Ryu  <cwryu@debian.org>
+
+	* configure.in (BONOBO_EXPLICIT_TRANSLATION_DOMAIN): 
+	* acconfig.h: Define BONOBO_EXPLICIT_TRANSLATION_DOMAIN in
+	config.h.  Fixes #301120.
+
 2005-04-01  Steve Murphy  <murf@e-tools.com>
 
         * configure.in: Added "rw" to ALL_LINGUAS.
Index: src/htmlgdkpainter.c
===================================================================
--- src/htmlgdkpainter.c	(.../upstream/current)	(revision 101)
+++ src/htmlgdkpainter.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -31,7 +31,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtksignal.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "htmlentity.h"
 #include "htmlgdkpainter.h"
Index: src/ChangeLog
===================================================================
--- src/ChangeLog	(.../upstream/current)	(revision 101)
+++ src/ChangeLog	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -1,3 +1,16 @@
+2005-04-19  Changwoo Ryu  <cwryu@debian.org>
+
+	* htmlgdkpainter.c: Include <glib/gi18n-lib.h> instead of
+	<glib/gi18n.h> to specify the translation domain explicitly. Fixes
+	#301120.
+	* htmlengine-print.c: likewise.
+	* htmlbutton.c: likewise.
+	* html-component.c: likewise.
+	* htmlembedded.c: likewise.
+	* htmlrule.c: likewise.
+	* gtkhtml-properties.c: likewise.
+	* gtkhtml.c: likewise.
+
 2005-03-29  Radek Doulik  <rodo@novell.com>
 
 	* test-suite.c (test_cursor_around_anchors): added test for cursor
Index: src/htmlengine-print.c
===================================================================
--- src/htmlengine-print.c	(.../upstream/current)	(revision 101)
+++ src/htmlengine-print.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include "gtkhtml.h"
 #include "gtkhtml-private.h"
Index: src/htmlbutton.c
===================================================================
--- src/htmlbutton.c	(.../upstream/current)	(revision 101)
+++ src/htmlbutton.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -25,7 +25,7 @@
 #include "htmlbutton.h"
 #include "htmlform.h"
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 HTMLButtonClass html_button_class;
 
Index: src/htmlembedded.c
===================================================================
--- src/htmlembedded.c	(.../upstream/current)	(revision 101)
+++ src/htmlembedded.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <gtk/gtksignal.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "gtkhtml.h"
 #include "gtkhtml-embedded.h"
 #include "htmlembedded.h"
Index: src/htmlrule.c
===================================================================
--- src/htmlrule.c	(.../upstream/current)	(revision 101)
+++ src/htmlrule.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -22,7 +22,7 @@
 */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "htmlcolor.h"
 #include "htmlcolorset.h"
 #include "htmlengine-save.h"
Index: src/gtkhtml-properties.c
===================================================================
--- src/gtkhtml-properties.c	(.../upstream/current)	(revision 101)
+++ src/gtkhtml-properties.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <locale.h>
 #include <gdk/gdkx.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include "gtkhtml.h"
 #include "gtkhtml-properties.h"
 #include "htmlfontmanager.h"
Index: src/gtkhtml.c
===================================================================
--- src/gtkhtml.c	(.../upstream/current)	(revision 101)
+++ src/gtkhtml.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -27,7 +27,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include <gnome.h>
Index: acconfig.h
===================================================================
--- acconfig.h	(.../upstream/current)	(revision 101)
+++ acconfig.h	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -23,6 +23,7 @@
 #undef GTKHTML_RELEASE
 #undef GTKHTML_RELEASE_STRING
 #undef GNOME_EXPLICIT_TRANSLATION_DOMAIN
+#undef BONOBO_EXPLICIT_TRANSLATION_DOMAIN
 #undef HAVE_OLD_SOUP
 
 @BOTTOM@
Index: a11y/html.c
===================================================================
--- a11y/html.c	(.../upstream/current)	(revision 101)
+++ a11y/html.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <atk/atkcomponent.h>
 #include <atk/atkstateset.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "gtkhtml.h"
 #include "htmlengine.h"
Index: a11y/object.c
===================================================================
--- a11y/object.c	(.../upstream/current)	(revision 101)
+++ a11y/object.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -21,6 +21,8 @@
  *  Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "gtkhtml.h"
 #include "htmlengine.h"
 #include "htmlobject.h"
@@ -29,7 +31,7 @@
 #include "paragraph.h"
 #include "utils.h"
 #include "text.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 static void gtk_html_a11y_class_init (GtkHTMLA11YClass *klass);
 static void gtk_html_a11y_init       (GtkHTMLA11Y *a11y);
Index: a11y/ChangeLog
===================================================================
--- a11y/ChangeLog	(.../upstream/current)	(revision 101)
+++ a11y/ChangeLog	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -1,3 +1,11 @@
+2005-04-19  Changwoo Ryu  <cwryu@debian.org>
+
+	* html.c: Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> to
+	specify the translation domain explicitly. Fixes #301120.
+	* object.c: likewise.
+	* image.c: likewise.
+	* text.c: likewise.
+
 2005-03-01  Mengjie Yu  <meng-jie.yu@sun.com>
 
 	* object.c: (gtk_html_a11y_new):we need to notify gnopernicus
Index: a11y/image.c
===================================================================
--- a11y/image.c	(.../upstream/current)	(revision 101)
+++ a11y/image.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -29,7 +29,7 @@
 #include "html.h"
 #include "image.h"
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 static void html_a11y_image_class_init    (HTMLA11YImageClass *klass);
 static void html_a11y_image_init          (HTMLA11YImage *a11y_image);
Index: a11y/text.c
===================================================================
--- a11y/text.c	(.../upstream/current)	(revision 101)
+++ a11y/text.c	(.../patches/000-lib-i18n/3.6.2)	(revision 101)
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <atk/atkcomponent.h>
 #include <atk/atktext.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib/gmacros.h>
 
 #include "gtkhtml.h"
