From f7be7085b4de7d37c88b8149335471c590360efd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 17 Jan 2004 22:15:58 +0000 Subject: [PATCH] Split the gtk translations into the domains gtk20 and gtk20-properties. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ Makefile.am | 2 +- configure.in | 1 + gdk/gdkintl.h | 2 +- gtk/gtkintl.h | 2 +- gtk/gtkmain.c | 2 ++ 10 files changed, 81 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d1111d5e..87b432f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sat Jan 17 23:05:52 2004 Matthias Clasen + + The second part of the fix for #114351 (see also + gdk-pixbuf/ChangeLog and po/ChangeLog): + + * Makefile.am (SUBDIRS): Add po-properties. + + * configure.in (AC_CONFIG_FILES): Add po-properties/Makefile.in + + * gdk/gdkintl.h (P_): + * gtk/gtkintl.h (P_): Use translation domain gtk20-properties. + + * gtk/gtkmain.c (gtk_parse_args): Call bindtextdomain and + bind_textdomain_codeset for gtk20-properties as well. + Sat Jan 17 22:00:07 2004 Soeren Sandmann * gtk/gtktoolbar.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6d1111d5e..87b432f76 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Sat Jan 17 23:05:52 2004 Matthias Clasen + + The second part of the fix for #114351 (see also + gdk-pixbuf/ChangeLog and po/ChangeLog): + + * Makefile.am (SUBDIRS): Add po-properties. + + * configure.in (AC_CONFIG_FILES): Add po-properties/Makefile.in + + * gdk/gdkintl.h (P_): + * gtk/gtkintl.h (P_): Use translation domain gtk20-properties. + + * gtk/gtkmain.c (gtk_parse_args): Call bindtextdomain and + bind_textdomain_codeset for gtk20-properties as well. + Sat Jan 17 22:00:07 2004 Soeren Sandmann * gtk/gtktoolbar.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6d1111d5e..87b432f76 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Sat Jan 17 23:05:52 2004 Matthias Clasen + + The second part of the fix for #114351 (see also + gdk-pixbuf/ChangeLog and po/ChangeLog): + + * Makefile.am (SUBDIRS): Add po-properties. + + * configure.in (AC_CONFIG_FILES): Add po-properties/Makefile.in + + * gdk/gdkintl.h (P_): + * gtk/gtkintl.h (P_): Use translation domain gtk20-properties. + + * gtk/gtkmain.c (gtk_parse_args): Call bindtextdomain and + bind_textdomain_codeset for gtk20-properties as well. + Sat Jan 17 22:00:07 2004 Soeren Sandmann * gtk/gtktoolbar.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6d1111d5e..87b432f76 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Sat Jan 17 23:05:52 2004 Matthias Clasen + + The second part of the fix for #114351 (see also + gdk-pixbuf/ChangeLog and po/ChangeLog): + + * Makefile.am (SUBDIRS): Add po-properties. + + * configure.in (AC_CONFIG_FILES): Add po-properties/Makefile.in + + * gdk/gdkintl.h (P_): + * gtk/gtkintl.h (P_): Use translation domain gtk20-properties. + + * gtk/gtkmain.c (gtk_parse_args): Call bindtextdomain and + bind_textdomain_codeset for gtk20-properties as well. + Sat Jan 17 22:00:07 2004 Soeren Sandmann * gtk/gtktoolbar.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6d1111d5e..87b432f76 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Sat Jan 17 23:05:52 2004 Matthias Clasen + + The second part of the fix for #114351 (see also + gdk-pixbuf/ChangeLog and po/ChangeLog): + + * Makefile.am (SUBDIRS): Add po-properties. + + * configure.in (AC_CONFIG_FILES): Add po-properties/Makefile.in + + * gdk/gdkintl.h (P_): + * gtk/gtkintl.h (P_): Use translation domain gtk20-properties. + + * gtk/gtkmain.c (gtk_parse_args): Call bindtextdomain and + bind_textdomain_codeset for gtk20-properties as well. + Sat Jan 17 22:00:07 2004 Soeren Sandmann * gtk/gtktoolbar.c: diff --git a/Makefile.am b/Makefile.am index 8284462ec..cad44f6ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for GTK+ SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib -SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros +SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros # require automake 1.4 AUTOMAKE_OPTIONS = 1.7 diff --git a/configure.in b/configure.in index 91a688d72..d3b5875e6 100644 --- a/configure.in +++ b/configure.in @@ -1540,6 +1540,7 @@ gdk-2.0-uninstalled.pc gtk+-2.0-uninstalled.pc m4macros/Makefile po/Makefile.in +po-properties/Makefile.in build/Makefile build/win32/Makefile build/win32/dirent/Makefile diff --git a/gdk/gdkintl.h b/gdk/gdkintl.h index 71fdd5cca..c8b4c8a53 100644 --- a/gdk/gdkintl.h +++ b/gdk/gdkintl.h @@ -6,7 +6,7 @@ #ifdef ENABLE_NLS #include #define _(String) dgettext(GETTEXT_PACKAGE,String) -#define P_(String) dgettext(GETTEXT_PACKAGE,String) +#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String) #ifdef gettext_noop #define N_(String) gettext_noop(String) #else diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h index f655fab42..8ac947593 100644 --- a/gtk/gtkintl.h +++ b/gtk/gtkintl.h @@ -6,7 +6,7 @@ #ifdef ENABLE_NLS #include #define _(String) dgettext(GETTEXT_PACKAGE,String) -#define P_(String) dgettext(GETTEXT_PACKAGE,String) +#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String) #ifdef gettext_noop #define N_(String) gettext_noop(String) #else diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index b3c15bc1f..813988fda 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -837,8 +837,10 @@ gtk_parse_args (int *argc, #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE "-properties", GTK_LOCALEDIR); # ifdef HAVE_BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8"); # endif #endif -- 2.43.2