gnome-utils r8210 - in trunk/gnome-dictionary: . libgdict src

[ebassi svn gnome org]

Author: ebassi
Date: Fri Dec 19 22:48:36 2008
New Revision: 8210
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8210&view=rev

Log:
2008-12-19  Emmanuele Bassi  <ebassi gnome org>

	Bug 454691 â Messages in the gnome-dictionary --help output are
	not all translated

	* libgdict/gdict-utils.c: Mark debug command line options as
	translatable.

	* src/gdict-app.c (gdict_init): Fix translation of the command
	line options. (Gabor Kelemen)

Modified:
   trunk/gnome-dictionary/ChangeLog
   trunk/gnome-dictionary/libgdict/gdict-utils.c
   trunk/gnome-dictionary/src/gdict-app.c

Modified: trunk/gnome-dictionary/libgdict/gdict-utils.c
==============================================================================
--- trunk/gnome-dictionary/libgdict/gdict-utils.c	(original)
+++ trunk/gnome-dictionary/libgdict/gdict-utils.c	Fri Dec 19 22:48:36 2008
@@ -94,9 +94,9 @@
 static GOptionEntry gdict_args[] = {
 #ifdef GDICT_ENABLE_DEBUG
   { "gdict-debug", 0, 0, G_OPTION_ARG_CALLBACK, gdict_arg_debug_cb,
-    "GDict debugging flags to set", "FLAGS" },
+    N_("GDict debugging flags to set"), N_("FLAGS") },
   { "gdict-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, gdict_arg_no_debug_cb,
-    "GDict debugging flags to unset", "FLAGS" },
+    N_("GDict debugging flags to unset"), N_("FLAGS") },
 #endif /* GDICT_ENABLE_DEBUG */
   { NULL, },
 };

Modified: trunk/gnome-dictionary/src/gdict-app.c
==============================================================================
--- trunk/gnome-dictionary/src/gdict-app.c	(original)
+++ trunk/gnome-dictionary/src/gdict-app.c	Fri Dec 19 22:48:36 2008
@@ -322,7 +322,6 @@
 {
   GError *gconf_error, *err = NULL;
   GOptionContext *context;
-  GOptionGroup *group;
   gchar *loader_path;
   gchar **lookup_words = NULL;
   gchar **match_words = NULL;
@@ -367,26 +366,21 @@
   /* create the new option context */
   context = g_option_context_new (_(" - Look up words in dictionaries"));
   
-  /* gnome dictionary option group */
-  group = g_option_group_new ("gnome-dictionary",
-		  	      _("Dictionary and spelling tool"),
-			      _("Show Dictionary options"),
-			      NULL, NULL);
-  g_option_group_add_entries (group, gdict_app_goptions);
-  g_option_context_set_main_group (context, group);
+  g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+  g_option_context_add_main_entries (context, gdict_app_goptions, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gdict_get_option_group ());
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
   g_option_context_parse (context, argc, argv, &err);
+  if (err)
+    {
+      g_critical ("Failed to parse argument: %s", err->message);
+      g_error_free (err);
+      g_option_context_free (context);
+      gdict_cleanup ();
 
-  if (err) {
-    g_critical ("Failed to parse argument: %s", err->message);
-    g_error_free (err);
-    g_option_context_free (context);
-    gdict_cleanup ();
-
-    exit (1);
-  }
+      exit (1);
+    }
   
   g_set_application_name (_("Dictionary"));
   gtk_window_set_default_icon_name ("accessories-dictionary");