Index: libgnome/libgnome/gnome-init.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-init.c,v
retrieving revision 1.106
diff -u -3 -p -r1.106 gnome-init.c
--- libgnome/libgnome/gnome-init.c	23 Sep 2003 20:18:44 -0000	1.106
+++ libgnome/libgnome/gnome-init.c	26 Sep 2003 00:39:40 -0000
@@ -441,10 +441,11 @@ libgnome_module_info_get (void)
 		static GnomeModuleRequirement req[4];
 
 		bindtextdomain (GETTEXT_PACKAGE, LIBGNOME_LOCALEDIR);
+#if 0
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
-
+#endif
 		req[0].required_version = "0.9.1";
 		req[0].module_info = gnome_bonobo_activation_module_info_get ();
 
Index: libgnome/libgnome/gnome-program.c
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/gnome-program.c,v
retrieving revision 1.62
diff -u -3 -p -r1.62 gnome-program.c
--- libgnome/libgnome/gnome-program.c	23 Jul 2003 09:35:30 -0000	1.62
+++ libgnome/libgnome/gnome-program.c	26 Sep 2003 00:39:40 -0000
@@ -1446,6 +1446,10 @@ gnome_program_parse_args (GnomeProgram *
     if (program->_priv->state != APP_PREINIT_DONE)
 	return;
 
+    /* translate popt output by default */
+#ifdef ENABLE_NLS
+    setlocale (LC_ALL, "");
+#endif
     ctx = program->_priv->arg_context;
     while ((nextopt = poptGetNextOpt (ctx)) > 0 || nextopt == POPT_ERROR_BADOPT)
 	/* do nothing */ ;
Index: libgnomeui//libgnomeui/gnome-client.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-client.c,v
retrieving revision 1.131
diff -u -3 -p -r1.131 gnome-client.c
--- libgnomeui//libgnomeui/gnome-client.c	1 May 2003 16:21:33 -0000	1.131
+++ libgnomeui//libgnomeui/gnome-client.c	26 Sep 2003 00:39:52 -0000
@@ -983,6 +983,8 @@ gnome_client_module_info_get (void)
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[3];
 
+		bindtextdomain (GETTEXT_PACKAGE, GNOMEUILOCALEDIR);
+
 		req[0].required_version = "1.3.7";
 		req[0].module_info = gnome_gtk_module_info_get ();
 
Index: libgnomeui//libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.191
diff -u -3 -p -r1.191 gnome-ui-init.c
--- libgnomeui//libgnomeui/gnome-ui-init.c	1 Jul 2003 11:24:16 -0000	1.191
+++ libgnomeui//libgnomeui/gnome-ui-init.c	26 Sep 2003 00:39:52 -0000
@@ -113,10 +113,11 @@ static struct poptOption libgnomeui_opti
         {NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL},
 	{NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST,
 	 &libgnomeui_arg_callback, 0, NULL, NULL},
-	{"disable-crash-dialog", '\0', POPT_ARG_NONE, NULL, ARG_DISABLE_CRASH_DIALOG},
+	{"disable-crash-dialog", '\0', POPT_ARG_NONE, NULL, ARG_DISABLE_CRASH_DIALOG,
+        N_("Disable Crash Dialog"), NULL},
         {"display", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, NULL, ARG_DISPLAY,
          N_("X display to use"), N_("DISPLAY")},
-	{NULL, '\0', 0, NULL, 0}
+	{NULL, '\0', 0, NULL, 0, NULL, NULL}
 };
 
 const GnomeModuleInfo *
@@ -133,6 +134,8 @@ libgnomeui_module_info_get (void)
 
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[6];
+
+		bindtextdomain (GETTEXT_PACKAGE, GNOMEUILOCALEDIR);
 
 		req[0].required_version = "1.101.2";
 		req[0].module_info = LIBBONOBOUI_MODULE;
Index: libbonobo/bonobo-activation/bonobo-activation-init.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo-activation/bonobo-activation-init.c,v
retrieving revision 1.57
diff -u -3 -p -r1.57 bonobo-activation-init.c
--- libbonobo/bonobo-activation/bonobo-activation-init.c	9 Jun 2003 13:17:55 -0000	1.57
+++ libbonobo/bonobo-activation/bonobo-activation-init.c	26 Sep 2003 00:40:24 -0000
@@ -188,7 +188,7 @@ static int   bonobo_activation_ior_fd = 
 static char *bonobo_activation_activate_iid = NULL;
 
 struct poptOption bonobo_activation_popt_options[] = {
-        { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL },
+        { NULL, '\0', POPT_ARG_INTL_DOMAIN, GETTEXT_PACKAGE, 0, NULL, NULL },
         { "oaf-ior-fd", '\0', POPT_ARG_INT, &bonobo_activation_ior_fd, 0,
           N_("File descriptor to print IOR on"), N_("FD") },
         { "oaf-activate-iid", '\0', POPT_ARG_STRING, &bonobo_activation_activate_iid, 0,
@@ -222,6 +222,7 @@ bonobo_activation_ior_fd_get (void)
 void
 bonobo_activation_preinit (gpointer app, gpointer mod_info)
 {
+        bindtextdomain (GETTEXT_PACKAGE, BONOBO_ACTIVATION_LOCALEDIR);
 }
 
 void
