libnm*: fix library gettext usage

Libraries need to include <gi18n-lib.h>, not <gi18n.h>, so that _()
will get defined to "dgettext (GETTEXT_DOMAIN, string)" rather than
"gettext (string)" (which will use the program's default domain, which
works fine for programs in the NetworkManager tree, but not for
external users). Likewise, we need to call bindtextdomain() so that
gettext can find the translations if the library is installed in a
different prefix from the program using it (and
bind_textdomain_codeset(), so it will know the translations are in
UTF-8 even if the locale isn't).

(The fact that no one noticed this was broken before is because the
libraries didn't really start returning useful translated strings much
until 0.9.10, and none of the out-of-tree clients have been updated to
actually show those strings to users yet.)

libnm-core/Makefile.am

@@ -5,6 +5,7 @@ SUBDIRS = . tests
 AM_CPPFLAGS = \
 	-I${top_srcdir}/include \
 	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DNETWORKMANAGER_COMPILATION \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS)

libnm-core/crypto.c

@@ -28,7 +28,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "crypto.h"
 #include "nm-errors.h"

libnm-core/crypto_gnutls.c

@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>

libnm-core/crypto_nss.c

@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <prinit.h>
 #include <nss.h>

libnm-core/nm-connection.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <glib-object.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 #include "nm-connection.h"
 #include "nm-connection-private.h"

libnm-core/nm-setting-8021x.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"

libnm-core/nm-setting-adsl.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"

libnm-core/nm-setting-bluetooth.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-cdma.h"

libnm-core/nm-setting-bond.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bond.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bridge-port.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge-port.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bridge.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-connection-private.h"

libnm-core/nm-setting-cdma.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-cdma.h"
 #include "nm-utils.h"

libnm-core/nm-setting-connection.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"

libnm-core/nm-setting-dcb.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-dcb.h"
 #include "nm-utils.h"

libnm-core/nm-setting-gsm.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"

libnm-core/nm-setting-infiniband.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"

libnm-core/nm-setting-ip-config.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <arpa/inet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"

libnm-core/nm-setting-ip4-config.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-ip6-config.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-olpc-mesh.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-olpc-mesh.h"
 #include "nm-dbus-interface.h"

libnm-core/nm-setting-ppp.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-pppoe.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-pppoe.h"
 #include "nm-setting-ppp.h"

libnm-core/nm-setting-team-port.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team-port.h"
 #include "nm-utils.h"

libnm-core/nm-setting-team.c

@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team.h"
 #include "nm-utils.h"

libnm-core/nm-setting-vlan.c

@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vlan.h"
 #include "nm-utils.h"

libnm-core/nm-setting-vpn.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vpn.h"
 #include "nm-utils.h"

libnm-core/nm-setting-wimax.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wimax.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-wired.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wired.h"
 #include "nm-utils.h"

libnm-core/nm-setting-wireless-security.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"

libnm-core/nm-setting-wireless.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless.h"
 #include "nm-dbus-interface.h"

libnm-core/nm-setting.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
 #include "nm-setting.h"

libnm-core/nm-utils.c

@@ -26,6 +26,7 @@
 #include <netinet/ether.h>
 #include <arpa/inet.h>
 #include <uuid/uuid.h>
+#include <libintl.h>
 #include <gmodule.h>
 
 #include "nm-utils.h"
@@ -242,6 +243,9 @@ nm_utils_init (GError **error)
 	if (!initialized) {
 		initialized = TRUE;
 
+		bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 		if (!crypto_init (error))
 			return FALSE;
 

libnm-glib/nm-device.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include "NetworkManager.h"

libnm-glib/nm-remote-connection.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 #include <nm-utils.h>

libnm-util/Makefile.am

@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
 	-DG_LOG_DOMAIN=\""libnm-util"\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \

libnm-util/crypto.c

@@ -28,7 +28,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "crypto.h"
 

libnm-util/crypto_gnutls.c

@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>

libnm-util/crypto_nss.c

@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <prinit.h>
 #include <nss.h>

libnm-util/nm-connection.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <glib-object.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
 #include "nm-connection.h"

libnm-util/nm-setting-8021x.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-8021x.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-adsl.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"

libnm-util/nm-setting-bluetooth.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-param-spec-specialized.h"
 #include "nm-dbus-glib-types.h"

libnm-util/nm-setting-bond.c

@@ -27,7 +27,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bond.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-bridge-port.c

@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-bridge-port.h"
 #include "nm-utils.h"

libnm-util/nm-setting-bridge.c

@@ -25,7 +25,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <linux/if_ether.h>
 
 #include "nm-setting-bridge.h"

libnm-util/nm-setting-cdma.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-cdma.h"
 #include "nm-utils.h"

libnm-util/nm-setting-connection.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"

libnm-util/nm-setting-dcb.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-dcb.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-gsm.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-gsm.h"
 #include "nm-utils.h"

libnm-util/nm-setting-infiniband.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <linux/if_infiniband.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-infiniband.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-ip4-config.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip4-config.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-ip6-config.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ip6-config.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-olpc-mesh.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "NetworkManager.h"
 #include "nm-setting-olpc-mesh.h"

libnm-util/nm-setting-ppp.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"

libnm-util/nm-setting-pppoe.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-pppoe.h"
 #include "nm-setting-ppp.h"

libnm-util/nm-setting-team-port.c

@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team-port.h"
 #include "nm-utils.h"

libnm-util/nm-setting-team.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-team.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-vlan.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vlan.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-vpn.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-vpn.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-wimax.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <net/ethernet.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wimax.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-wired.c

@@ -26,7 +26,7 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wired.h"
 #include "nm-param-spec-specialized.h"

libnm-util/nm-setting-wireless-security.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"

libnm-util/nm-setting-wireless.c

@@ -26,7 +26,7 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "NetworkManager.h"
 #include "nm-setting-wireless.h"

libnm-util/nm-setting.c

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-setting.h"
 #include "nm-setting-private.h"

libnm-util/nm-utils.c

@@ -26,6 +26,7 @@
 #include <netinet/ether.h>
 #include <linux/if_infiniband.h>
 #include <uuid/uuid.h>
+#include <libintl.h>
 #include <gmodule.h>
 
 #include "nm-utils.h"
@@ -234,6 +235,9 @@ nm_utils_init (GError **error)
 	if (!initialized) {
 		initialized = TRUE;
 
+		bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 		if (!crypto_init (error))
 			return FALSE;
 

libnm/nm-device-adsl.c

@@ -29,7 +29,7 @@
 #include "nm-setting-connection.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE)
 

libnm/nm-device-bond.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-bridge.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-bt.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-ethernet.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-generic.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-device-generic.h"
 #include "nm-device-private.h"

libnm/nm-device-infiniband.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-modem.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-olpc-mesh.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-team.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-vlan.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-wifi.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device-wimax.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 

libnm/nm-device.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include "nm-dbus-interface.h"

libnm/nm-manager.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
 #include "nm-manager.h"

libnm/nm-object.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>

libnm/nm-remote-connection.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-utils.h>

libnm/nm-remote-settings.c

@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 

libnm/nm-vpn-plugin-old.c

@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
 #include "nm-glib-compat.h"