From 7469a2626a33f1da4aafe51c8b657707f6b6e086 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 17 Aug 2009 08:53:59 -0400
Subject: [PATCH] Bug 591859 - Use glib/gi18n-lib to get correct gettext
 package

We need to use the -lib variant which in turn uses the
GETTEXT_PACKAGE define, because the default translation
domain is actually mutter, not gnome-shell.
---
 js/ui/dash.js                  | 2 ++
 src/gdmuser/gdm-user-manager.c | 3 ++-
 src/gdmuser/gdm-user.c         | 3 ++-
 src/shell-global.c             | 2 +-
 src/shell-status-menu.c        | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/ui/dash.js b/js/ui/dash.js
index a96efa059..dd4e4bbf5 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -593,6 +593,8 @@ Dash.prototype = {
 
         /***** Places *****/
 
+        /* Translators: This is in the sense of locations for documents,
+           network locations, etc. */
         let placesSection = new Section(_("PLACES"), true);
         let placesDisplay = new Places.Places();
         placesSection.content.append(placesDisplay.actor, Big.BoxPackFlags.EXPAND);
diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
index bde7fccca..167ca7d55 100644
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@@ -35,7 +35,8 @@
 #endif /* HAVE_PATHS_H */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+/* Note on sync with gdm; need to use -lib here */
+#include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
 #include <gio/gio.h>
diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index 27bf8ec4e..d5d0d346f 100644
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -26,7 +26,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
+/* Note on sync with gdm; need to use -lib here */
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/src/shell-global.c b/src/shell-global.c
index 7dd5c44be..e192b34e5 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <dbus/dbus-glib.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <math.h>
 #include <X11/extensions/Xfixes.h>
 
diff --git a/src/shell-status-menu.c b/src/shell-status-menu.c
index 1ea6e1d7b..a5b1ccd78 100644
--- a/src/shell-status-menu.c
+++ b/src/shell-status-menu.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>