2006-05-24 Robert Love <rml@novell.com>

* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
	  src/NetworkManager.c: Take care to call bindtextdomain with the
	  location of msgid files.
	* src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo
	  files.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1758 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

src/Makefile.am

@@ -106,6 +106,7 @@ NetworkManager_CPPFLAGS = 							\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"				\
 	-DNM_RUN_DIR=\"$(rundir)\"						\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
 	-DARP_DEBUG
 
 

src/NetworkManager.c

@@ -19,6 +19,10 @@
  * (C) Copyright 2004 Red Hat, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -32,6 +36,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <libintl.h>
 
 #include "NetworkManager.h"
 #include "nm-utils.h"
@@ -684,6 +689,10 @@ int main( int argc, char *argv[] )
 		return (EXIT_FAILURE);
 	}
 
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	/* Parse options */
 	while (1)
 	{