diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | common/Makefile.am | 2 | ||||
-rw-r--r-- | utils/gdm-screenshot.c | 7 | ||||
-rw-r--r-- | utils/gdmflexiserver.c | 7 |
4 files changed, 19 insertions, 5 deletions
@@ -1,5 +1,13 @@ 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> + +2008-12-02 William Jon McCann <jmccann@redhat.com> + * COPYING: Add GPLv2+ version of COPYING file so that autotools won't stick a v3 one in the tarball. Fixes #558334 diff --git a/common/Makefile.am b/common/Makefile.am index 101b3f4e..fae31e5e 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -26,7 +26,7 @@ INCLUDES = \ noinst_LTLIBRARIES = \ libgdmcommon.la \ - $(null) + $(NULL) BUILT_SOURCES = \ gdm-settings-glue.h \ diff --git a/utils/gdm-screenshot.c b/utils/gdm-screenshot.c index f92744b5..b6f60117 100644 --- a/utils/gdm-screenshot.c +++ b/utils/gdm-screenshot.c @@ -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 @@ main (int argc, char *argv[]) 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); diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c index 6afa5b5e..f2159345 100644 --- a/utils/gdmflexiserver.c +++ b/utils/gdmflexiserver.c @@ -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 @@ main (int argc, char *argv[]) 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); |