Home | History | Annotate | Download | only in patches
      1 --- clutter-0.8.2/clutter/clutter-main.c.orig	2009-01-06 07:17:50.878788708 +0900
      2 +++ clutter-0.8.2/clutter/clutter-main.c	2009-01-06 07:32:39.992841607 +0900
      3 @@ -1138,16 +1138,16 @@ clutter_init_real (GError **error)
      4  
      5  static GOptionEntry clutter_args[] = {
      6    { "clutter-show-fps", 0, 0, G_OPTION_ARG_NONE, &clutter_show_fps,
      7 -    "Show frames per second", NULL },
      8 +    N_("Show frames per second"), NULL },
      9    { "clutter-default-fps", 0, 0, G_OPTION_ARG_INT, &clutter_default_fps,
     10 -    "Default frame rate", "FPS" },
     11 +    N_("Default frame rate"), "FPS" },
     12    { "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &clutter_fatal_warnings,
     13 -    "Make all warnings fatal", NULL },
     14 +    N_("Make all warnings fatal"), NULL },
     15  #ifdef CLUTTER_ENABLE_DEBUG
     16    { "clutter-debug", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_debug_cb,
     17 -    "Clutter debugging flags to set", "FLAGS" },
     18 +    N_("Clutter debugging flags to set"), "FLAGS" },
     19    { "clutter-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, clutter_arg_no_debug_cb,
     20 -    "Clutter debugging flags to unset", "FLAGS" },
     21 +    N_("Clutter debugging flags to unset"), "FLAGS" },
     22  #endif /* CLUTTER_ENABLE_DEBUG */
     23    { NULL, },
     24  };
     25 @@ -1293,13 +1293,14 @@ clutter_get_option_group (void)
     26    context = clutter_context_get_default ();
     27  
     28    group = g_option_group_new ("clutter",
     29 -                              "Clutter Options",
     30 -                              "Show Clutter Options",
     31 +                              _("Clutter Options"),
     32 +                              _("Show Clutter Options"),
     33                                NULL,
     34                                NULL);
     35  
     36    g_option_group_set_parse_hooks (group, pre_parse_hook, post_parse_hook);
     37    g_option_group_add_entries (group, clutter_args);
     38 +  g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
     39  
     40    /* add backend-specific options */
     41    _clutter_backend_add_options (context->backend, group);
     42 @@ -2090,6 +2091,9 @@ clutter_base_init (void)
     43  
     44        initialised = TRUE;
     45  
     46 +      bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
     47 +      bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
     48 +
     49        /* initialise GLib type system */
     50        g_type_init ();
     51  
     52 --- clutter-0.8.2/clutter/glx/clutter-backend-glx.c.orig	2009-01-06 07:33:55.676743280 +0900
     53 +++ clutter-0.8.2/clutter/glx/clutter-backend-glx.c	2009-01-06 07:34:46.453520942 +0900
     54 @@ -29,6 +29,8 @@
     55  #include <unistd.h>
     56  #endif
     57  
     58 +#include <glib/gi18n-lib.h>
     59 +
     60  #include <sys/stat.h>
     61  #include <sys/ioctl.h>
     62  #include <fcntl.h>
     63 @@ -148,7 +150,7 @@ static const GOptionEntry entries[] =
     64    { "vblank", 0, 
     65      0, 
     66      G_OPTION_ARG_STRING, &clutter_vblank_name,
     67 -    "VBlank method to be used (none, dri or glx)", "METHOD" 
     68 +    N_("VBlank method to be used (none, dri or glx)"), "METHOD" 
     69    },
     70    { NULL }
     71  };
     72 --- clutter-0.8.2/clutter/x11/clutter-backend-x11.c.orig	2009-01-06 06:34:32.569030040 +0900
     73 +++ clutter-0.8.2/clutter/x11/clutter-backend-x11.c	2009-01-06 07:33:15.484540766 +0900
     74 @@ -23,6 +23,8 @@
     75  #include "config.h"
     76  #endif
     77  
     78 +#include <glib/gi18n-lib.h>
     79 +
     80  #include <string.h>
     81  #include <sys/types.h>
     82  #ifdef HAVE_UNISTD_H
     83 @@ -227,18 +229,18 @@ static const GOptionEntry entries[] =
     84      "display", 0,
     85      G_OPTION_FLAG_IN_MAIN,
     86      G_OPTION_ARG_STRING, &clutter_display_name,
     87 -    "X display to use", "DISPLAY"
     88 +    N_("X display to use"), "DISPLAY"
     89    },
     90    {
     91      "screen", 0,
     92      G_OPTION_FLAG_IN_MAIN,
     93      G_OPTION_ARG_INT, &clutter_screen,
     94 -    "X screen to use", "SCREEN"
     95 +    N_("X screen to use"), "SCREEN"
     96    },
     97    { "synch", 0,
     98      0,
     99      G_OPTION_ARG_NONE, &clutter_synchronise,
    100 -    "Make X calls synchronous", NULL,
    101 +    N_("Make X calls synchronous"), NULL,
    102    },
    103    { NULL }
    104  };
    105 --- clutter-0.8.2/config.h.in.orig	2009-01-06 07:24:44.063078095 +0900
    106 +++ clutter-0.8.2/config.h.in	2009-01-06 07:24:51.492288147 +0900
    107 @@ -127,6 +127,9 @@
    108  /* Define to 1 if we have the XFIXES X extension */
    109  #undef HAVE_XFIXES
    110  
    111 +/* Define the location where the catalogs will be installed */
    112 +#undef LOCALEDIR
    113 +
    114  /* Name of package */
    115  #undef PACKAGE
    116  
    117 --- clutter-0.8.2/configure.ac.orig	2009-01-06 06:52:05.605524877 +0900
    118 +++ clutter-0.8.2/configure.ac	2009-01-06 07:25:34.339557504 +0900
    119 @@ -637,6 +637,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
    120  
    121  ALL_LINGUAS=""
    122  AM_GLIB_GNU_GETTEXT
    123 +GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
    124  
    125  AC_CONFIG_FILES([
    126          Makefile
    127