gdm r6613 - in trunk: . common utils

[mccann svn gnome org]

Author: mccann
Date: Wed Dec  3 02:22:06 2008
New Revision: 6613
URL: http://svn.gnome.org/viewvc/gdm?rev=6613&view=rev

Log:
2008-12-02  William Jon McCann  <jmccann redhat com>

	* common/Makefile.am:
	* utils/gdm-screenshot.c (main):
	* utils/gdmflexiserver.c (main):
	Translate help output.
	Patch from: Gabor Kelemen <kelemeng gnome hu>



Modified:
   trunk/ChangeLog
   trunk/common/Makefile.am
   trunk/utils/gdm-screenshot.c
   trunk/utils/gdmflexiserver.c

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Wed Dec  3 02:22:06 2008
@@ -26,7 +26,7 @@
 
 noinst_LTLIBRARIES = 		\
 	libgdmcommon.la		\
-	$(null)
+	$(NULL)
 
 BUILT_SOURCES =			\
 	gdm-settings-glue.h	\

Modified: trunk/utils/gdm-screenshot.c
==============================================================================
--- trunk/utils/gdm-screenshot.c	(original)
+++ trunk/utils/gdm-screenshot.c	Wed Dec  3 02:22:06 2008
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <locale.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -224,10 +225,12 @@
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
+        setlocale (LC_ALL, "");
 
         /* Option parsing */
-        ctx = g_option_context_new ("- New GDM login");
-        g_option_context_add_main_entries (ctx, options, _("Main Options"));
+        ctx = g_option_context_new (_("Take a picture of the screeen"));
+        g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE);
+        g_option_context_add_main_entries (ctx, options, NULL);
         g_option_context_parse (ctx, &argc, &argv, NULL);
         g_option_context_free (ctx);
 

Modified: trunk/utils/gdmflexiserver.c
==============================================================================
--- trunk/utils/gdmflexiserver.c	(original)
+++ trunk/utils/gdmflexiserver.c	Wed Dec  3 02:22:06 2008
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <locale.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -704,10 +705,12 @@
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
+        setlocale (LC_ALL, "");
 
         /* Option parsing */
-        ctx = g_option_context_new ("- New GDM login");
-        g_option_context_add_main_entries (ctx, options, _("Main Options"));
+        ctx = g_option_context_new (_("- New GDM login"));
+        g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE);
+        g_option_context_add_main_entries (ctx, options, NULL);
         g_option_context_parse (ctx, &argc, &argv, NULL);
         g_option_context_free (ctx);