Index: monikers/bonobo-moniker-oaf.c
===================================================================
--- monikers/bonobo-moniker-oaf.c	(révision 3329)
+++ monikers/bonobo-moniker-oaf.c	(copie de travail)
@@ -9,8 +9,8 @@
 #include <config.h>
 #include <string.h>
 
-#define BONOBO_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n-lib.h>
+
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-moniker-util.h>
 
Index: utils/bonobo-activation-sysconf.c
===================================================================
--- utils/bonobo-activation-sysconf.c	(révision 3329)
+++ utils/bonobo-activation-sysconf.c	(copie de travail)
@@ -31,8 +31,9 @@
 #include <libxml/parser.h>  
 #include <libxml/xmlmemory.h>
 
+#include <glib/gi18n.h>
+
 #include <bonobo-activation/bonobo-activation.h>
-#include "bonobo-activation/bonobo-activation-i18n.h"
 #include "activation-server/object-directory-config-file.h"
 
 #ifdef G_OS_WIN32
@@ -307,8 +308,3 @@ int main (int argc, char **argv)
 
         return 0;
 }
-
-
-
-
-
Index: samples/echo/echo-client.c
===================================================================
--- samples/echo/echo-client.c	(révision 3329)
+++ samples/echo/echo-client.c	(copie de travail)
@@ -6,8 +6,9 @@
  */
 
 #include <config.h>
+
+#include <glib/gi18n.h>
 #include <libbonobo.h>
-#include <bonobo/bonobo-i18n.h>
 #include "Bonobo_Sample_Echo.h"
 
 int 
Index: activation-server/object-directory-activate.c
===================================================================
--- activation-server/object-directory-activate.c	(révision 3329)
+++ activation-server/object-directory-activate.c	(copie de travail)
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bonobo-activation/bonobo-activation-i18n.h"
+#include <glib/gi18n.h>
 #include "bonobo-activation/bonobo-activation-private.h"
 
 #include "server.h"
Index: activation-server/activation-context-corba.c
===================================================================
--- activation-server/activation-context-corba.c	(révision 3329)
+++ activation-server/activation-context-corba.c	(copie de travail)
@@ -32,6 +32,8 @@
 #include <time.h>
 #include <string.h>
 
+#include <glib/gi18n.h>
+
 #include "server.h"
 
 #include "activation-context.h"
@@ -39,7 +41,6 @@
 #include "activation-context-query.h"
 #include "activation-server-corba-extensions.h"
 #include <libbonobo.h>
-#include <bonobo/bonobo-i18n.h>
 
 #undef LOCALE_DEBUG
 
Index: activation-server/object-directory-load.c
===================================================================
--- activation-server/object-directory-load.c	(révision 3329)
+++ activation-server/object-directory-load.c	(copie de travail)
@@ -31,9 +31,10 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
+
+#include <glib/gi18n.h>
 #include <glib/gmarkup.h>
 
-#include "bonobo-activation/bonobo-activation-i18n.h"
 #include "bonobo-activation/bonobo-activation-private.h"
 #include "server.h"
 
Index: activation-server/activation-server-corba-extensions.c
===================================================================
--- activation-server/activation-server-corba-extensions.c	(révision 3329)
+++ activation-server/activation-server-corba-extensions.c	(copie de travail)
@@ -29,10 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <glib/gi18n.h>
+
 #include "server.h"
 
 #include "activation-server-corba-extensions.h"
-#include <bonobo-activation/bonobo-activation-i18n.h>
 
 char *
 activation_server_CORBA_Context_get_value (CORBA_Context         ctx, 
Index: activation-server/activation-server-main.c
===================================================================
--- activation-server/activation-server-main.c	(révision 3329)
+++ activation-server/activation-server-main.c	(copie de travail)
@@ -27,10 +27,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#include <glib/gi18n.h>
 #include <ORBitservices/CosNaming.h>
 #include <ORBitservices/CosNaming_impl.h>
 #include <libbonobo.h>
-#include <bonobo/bonobo-i18n.h>
 
 #include "bonobo-activation/bonobo-activation-private.h"
 
Index: activation-server/object-directory-config-file.c
===================================================================
--- activation-server/object-directory-config-file.c	(révision 3329)
+++ activation-server/object-directory-config-file.c	(copie de travail)
@@ -29,7 +29,7 @@
 #include <libxml/xmlmemory.h> 
 #include <glib.h>
 
-#include "bonobo-activation/bonobo-activation-i18n.h"
+#include <glib/gi18n.h>
 #include "object-directory-config-file.h"
 
 #ifdef G_OS_WIN32
Index: activation-server/object-directory-corba.c
===================================================================
--- activation-server/object-directory-corba.c	(révision 3329)
+++ activation-server/object-directory-corba.c	(copie de travail)
@@ -32,9 +32,9 @@
 #include <unistd.h>
 #include <string.h>
 
+#include <glib/gi18n.h>
 #include "server.h"
 #include "object-directory.h"
-#include "bonobo-activation/bonobo-activation-i18n.h"
 #include "bonobo-activation/bonobo-activation-private.h"
 #include "activation-server-corba-extensions.h"
 
Index: bonobo-activation/bonobo-activation-i18n.h
===================================================================
--- bonobo-activation/bonobo-activation-i18n.h	(révision 3329)
+++ bonobo-activation/bonobo-activation-i18n.h	(copie de travail)
@@ -1,41 +0,0 @@
-/*
- *  bonobo-activation-i18n.h: internationalization support for bonobo-activation.
- *
- *  Shamelessly stolen from gnome-libs or somewhere else.
- *  Cannot remmeber exactly where.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License as
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  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
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this library; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    undef _
-#    define _(String) dgettext (GETTEXT_PACKAGE, 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)
-#endif
Index: bonobo-activation/bonobo-activation-activate.c
===================================================================
--- bonobo-activation/bonobo-activation-activate.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-activate.c	(copie de travail)
@@ -34,7 +34,7 @@
 #include <bonobo-activation/bonobo-activation-shlib.h>
 #include <bonobo-activation/bonobo-activation-client.h>
 #include <bonobo-activation/bonobo-activation-async.h>
-#include <bonobo-activation/bonobo-activation-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <bonobo-activation/Bonobo_ActivationContext.h>
 
 static Bonobo_ActivationEnvironment activation_environment;
Index: bonobo-activation/bonobo-activation-shlib.c
===================================================================
--- bonobo-activation/bonobo-activation-shlib.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-shlib.c	(copie de travail)
@@ -25,7 +25,7 @@
 #include <bonobo-activation/bonobo-activation-shlib.h>
 
 #include <bonobo-activation/Bonobo_GenericFactory.h>
-#include <bonobo-activation/bonobo-activation-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <bonobo-activation/bonobo-activation-init.h>
 #include <bonobo-activation/bonobo-activation-private.h>
 #include <gmodule.h>
Index: bonobo-activation/bonobo-activation-init.c
===================================================================
--- bonobo-activation/bonobo-activation-init.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-init.c	(copie de travail)
@@ -30,7 +30,7 @@
 #include "bonobo-activation-client.h"
 
 #include "Bonobo_ActivationContext.h"
-#include "bonobo-activation-i18n.h"
+#include <glib/gi18n-lib.h>
 #include "bonobo-activation-private.h"
 #include "bonobo-activation-register.h"
 #include "bonobo-activation-version.h"
@@ -384,6 +384,15 @@ init_gettext (gboolean bind_codeset)
 #endif
 }
 
+/**
+ * bonobo_activation_get_goption_group:
+ *
+ * Returns a #GOptionGroup for parsing bonobo-activation options.
+ * 
+ * Return value: a new #GOptionGroup
+ *
+ * Since: 2.14
+ */
 GOptionGroup *
 bonobo_activation_get_goption_group (void)
 {
Index: bonobo-activation/bonobo-activation-fork-server.c
===================================================================
--- bonobo-activation/bonobo-activation-fork-server.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-fork-server.c	(copie de travail)
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #include <bonobo-activation/bonobo-activation-private.h>
-#include <bonobo-activation/bonobo-activation-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <bonobo-activation/bonobo-activation-init.h>
 #include <bonobo-activation/Bonobo_ActivationContext.h>
 
Index: bonobo-activation/bonobo-activation-base-service.c
===================================================================
--- bonobo-activation/bonobo-activation-base-service.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-base-service.c	(copie de travail)
@@ -26,8 +26,10 @@
 /* This is part of the per-app CORBA bootstrapping - we use this to get 
    hold of a running metaserver and such */
 
+#include <config.h>
+
+#include <glib/gi18n-lib.h>
 
-#include <bonobo-activation/bonobo-activation-i18n.h>
 #include <bonobo-activation/bonobo-activation-init.h>
 #include <bonobo-activation/bonobo-activation-base-service.h>
 #include <bonobo-activation/bonobo-activation-private.h>
Index: bonobo-activation/bonobo-activation-get-language-list.c
===================================================================
--- bonobo-activation/bonobo-activation-get-language-list.c	(révision 3329)
+++ bonobo-activation/bonobo-activation-get-language-list.c	(copie de travail)
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <bonobo-activation/bonobo-activation-private.h>
-#include <bonobo-activation/bonobo-activation-i18n.h>
+#include <glib/gi18n-lib.h>
 
 /* ALEX:
  *        This function is not in use anymore in bonobo. However, some
Index: bonobo-activation/Makefile.am
===================================================================
--- bonobo-activation/Makefile.am	(révision 3329)
+++ bonobo-activation/Makefile.am	(copie de travail)
@@ -57,7 +57,6 @@ libbonobo_activation_la_SOURCES=		\
 	bonobo-activation-base-service.c	\
 	bonobo-activation-register.c		\
 	bonobo-activation-server-info.c		\
-	bonobo-activation-i18n.h		\
 	bonobo-activation-fork-server.c		\
 	bonobo-activation-init.c		\
 	$(NULL)
Index: bonobo/bonobo-debug.c
===================================================================
--- bonobo/bonobo-debug.c	(révision 3329)
+++ bonobo/bonobo-debug.c	(copie de travail)
@@ -48,7 +48,7 @@ bonobo_debug_init(void)
 }
 
 void
-bonobo_debug_print (char *name, char *fmt, ...)
+bonobo_debug_print (const char *name, char *fmt, ...)
 {
 	va_list args;
            
Index: bonobo/bonobo-debug.h
===================================================================
--- bonobo/bonobo-debug.h	(révision 3329)
+++ bonobo/bonobo-debug.h	(copie de travail)
@@ -20,6 +20,6 @@ typedef enum {
 extern BonoboDebugFlags _bonobo_debug_flags;
 
 void bonobo_debug_init  (void);
-void bonobo_debug_print (char *name, char *fmt, ...);
+void bonobo_debug_print (const char *name, char *fmt, ...);
 
 #endif /* _BONOBO_DEBUG_H_ */
Index: bonobo/bonobo-moniker-util.c
===================================================================
--- bonobo/bonobo-moniker-util.c	(révision 3329)
+++ bonobo/bonobo-moniker-util.c	(copie de travail)
@@ -9,8 +9,9 @@
  */
 #include "config.h"
 #include <string.h>
-#define BONOBO_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
-#include <bonobo/bonobo-i18n.h>
+
+#include <glib/gi18n-lib.h>
+
 #include <ORBitservices/CosNaming.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
Index: bonobo/bonobo-generic-factory.h
===================================================================
--- bonobo/bonobo-generic-factory.h	(révision 3329)
+++ bonobo/bonobo-generic-factory.h	(copie de travail)
@@ -76,11 +76,11 @@ int                   bonobo_generic_fac
 #if defined (__BONOBO_UI_MAIN_H__) || defined (LIBBONOBOUI_H)
 #define BONOBO_FACTORY_INIT(descr, version, argcp, argv)			\
 	if (!bonobo_ui_init (descr, version, argcp, argv))			\
-		g_error (_("Could not initialize Bonobo"));
+		g_error ("Could not initialize Bonobo");
 #else
 #define BONOBO_FACTORY_INIT(desc, version, argcp, argv)				\
 	if (!bonobo_init (argcp, argv))						\
-		g_error (_("Could not initialize Bonobo"));
+		g_error ("Could not initialize Bonobo");
 #endif
 
 #define BONOBO_OAF_FACTORY(oafiid, descr, version, callback, data)		\
Index: bonobo/bonobo-object.c
===================================================================
--- bonobo/bonobo-object.c	(révision 3329)
+++ bonobo/bonobo-object.c	(copie de travail)
@@ -13,6 +13,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+
+#include <glib/gi18n-lib.h>
+
 #include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/Bonobo.h>
@@ -26,7 +29,6 @@
 #include <bonobo/bonobo-types.h>
 #include <bonobo/bonobo-private.h>
 #include <bonobo/bonobo-debug.h>
-#include <bonobo/bonobo-i18n.h>
 
 /* We need decent ORB cnx. flushing on shutdown to make this work */
 #undef ASYNC_UNREFS
Index: bonobo/bonobo-exception.c
===================================================================
--- bonobo/bonobo-exception.c	(révision 3329)
+++ bonobo/bonobo-exception.c	(copie de travail)
@@ -10,8 +10,8 @@
 #include <glib.h>
 #include <string.h>
 
-#define BONOBO_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n-lib.h>    
+
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-private.h>
 #include <bonobo/bonobo-exception.h>
Index: bonobo/bonobo-running-context.c
===================================================================
--- bonobo/bonobo-running-context.c	(révision 3329)
+++ bonobo/bonobo-running-context.c	(copie de travail)
@@ -262,7 +262,8 @@ bonobo_running_context_trace_objects_T (
 
 #ifdef G_ENABLE_DEBUG
 		if(_bonobo_debug_flags & BONOBO_DEBUG_RUNNING) {
-			bonobo_debug_print (cmode [mode], 
+			const char *mode_string = cmode[mode];
+			bonobo_debug_print (mode_string, 
 					    "[%p]:CORBA_Object %d running objects at %s:%d",
 					    object, g_hash_table_size (ri->objects), fn, line);
 			g_hash_table_foreach (ri->objects, _running_context_list_objects, NULL);
Index: bonobo/bonobo-application.c
===================================================================
--- bonobo/bonobo-application.c	(révision 3329)
+++ bonobo/bonobo-application.c	(copie de travail)
@@ -1,12 +1,14 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include "config.h"
+
+#include <glib/gi18n-lib.h>    
+
 #include "bonobo-application.h"
 #include "bonobo-app-client.h"
 #include <bonobo-exception.h>
 #include "bonobo-marshal.h"
 #include "bonobo-arg.h"
 #include "bonobo-main.h"
-#include "bonobo-i18n.h"
 #include "bonobo-types.h"
 #include <string.h>
 
Index: bonobo/bonobo-moniker.c
===================================================================
--- bonobo/bonobo-moniker.c	(révision 3329)
+++ bonobo/bonobo-moniker.c	(copie de travail)
@@ -10,8 +10,8 @@
 #include "config.h"
 #include <string.h>
 
-#define BONOBO_EXPLICIT_TRANSLATION_DOMAIN GETTEXT_PACKAGE
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n-lib.h>    
+
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-moniker.h>
 #include <bonobo/bonobo-moniker-util.h>
Index: bonobo/Makefile.am
===================================================================
--- bonobo/Makefile.am	(révision 3329)
+++ bonobo/Makefile.am	(copie de travail)
@@ -11,6 +11,7 @@ INCLUDES = \
         -DBONOBO_BINDIR=\""$(bindir)"\" 		\
         -DBONOBO_LOCALSTATEDIR=\""$(localstatedir)"\" 	\
         -DBONOBO_LOCALEDIR=\""$(gnomelocaledir)"\" 	\
+	-DBONOBO_EXPLICIT_TRANSLATION_DOMAIN="GETTEXT_PACKAGE"	\
 	-DG_DISABLE_DEPRECATED				\
 	-DG_LOG_DOMAIN=\"Bonobo\"			\
 	-DVERSION=\"$(VERSION)\"