# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1141346498 0
# Node ID 7ab959eb857e833fb59e14576662db08de5b38b5
# Parent  d1b29fb3b6d0250d1492af3604bc48be6d3e1fdd
[gaim-migrate @ 15755]
A patch sent to gaim-i18n from Bj??rn Voigt:

'I agree with Danilo that we do not need the "property description" i18n
 strings in the imported GTK+ files.

 My attached patch changes the _() markers to P_() markers in
 gtkcellview.c and gtkcombobox.c. The file already had P_() markers. The
 files gtkcelllayout.c and gtkcellviewmenuitem.c do not have i18n strings.'

committer: Tailor Script <tailor@pidgin.im>

diff -r d1b29fb3b6d0 -r 7ab959eb857e src/gtkcellview.c
--- a/src/gtkcellview.c	Thu Mar 02 22:55:12 2006 +0000
+++ b/src/gtkcellview.c	Fri Mar 03 00:41:38 2006 +0000
@@ -33,18 +33,7 @@
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gobject/gmarshal.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  define _(x) gettext(x)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define N_(String) (String)
-#  define _(x) (x)
-#endif
+#define P_(x) (x)
 
 typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
 struct _GtkCellViewCellInfo
@@ -195,23 +184,23 @@
   g_object_class_install_property (gobject_class,
                                    PROP_BACKGROUND,
                                    g_param_spec_string ("background",
-                                                        _("Background color name"),
-                                                        _("Background color as a string"),
+                                                        P_("Background color name"),
+                                                        P_("Background color as a string"),
                                                         NULL,
                                                         G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_BACKGROUND_GDK,
                                    g_param_spec_boxed ("background_gdk",
-                                                      _("Background color"),
-                                                      _("Background color as a GdkColor"),
+                                                      P_("Background color"),
+                                                      P_("Background color as a GdkColor"),
                                                       GDK_TYPE_COLOR,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
 
 #define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
 
   ADD_SET_PROP ("background_set", PROP_BACKGROUND_SET,
-                _("Background set"),
-                _("Whether this tag affects the background color"));
+                P_("Background set"),
+                P_("Whether this tag affects the background color"));
 }
 
 static void
diff -r d1b29fb3b6d0 -r 7ab959eb857e src/gtkcombobox.c
--- a/src/gtkcombobox.c	Thu Mar 02 22:55:12 2006 +0000
+++ b/src/gtkcombobox.c	Fri Mar 03 00:41:38 2006 +0000
@@ -52,18 +52,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  define _(x) gettext(x)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define N_(String) (String)
-#  define _(x) (x)
-#endif
+#define P_(x) (x)
 
 /* WELCOME, to THE house of evil code */
 
@@ -487,16 +476,16 @@
   g_object_class_install_property (object_class,
                                    PROP_MODEL,
                                    g_param_spec_object ("model",
-                                                        _("ComboBox model"),
-                                                        _("The model for the combo box"),
+                                                        P_("ComboBox model"),
+                                                        P_("The model for the combo box"),
                                                         GTK_TYPE_TREE_MODEL,
                                                         G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_WRAP_WIDTH,
                                    g_param_spec_int ("wrap_width",
-                                                     _("Wrap width"),
-                                                     _("Wrap width for layouting the items in a grid"),
+                                                     P_("Wrap width"),
+                                                     P_("Wrap width for layouting the items in a grid"),
                                                      0,
                                                      G_MAXINT,
                                                      0,
@@ -505,8 +494,8 @@
   g_object_class_install_property (object_class,
                                    PROP_ROW_SPAN_COLUMN,
                                    g_param_spec_int ("row_span_column",
-                                                     _("Row span column"),
-                                                     _("TreeModel column containing the row span values"),
+                                                     P_("Row span column"),
+                                                     P_("TreeModel column containing the row span values"),
                                                      0,
                                                      G_MAXINT,
                                                      0,
@@ -515,9 +504,9 @@
   g_object_class_install_property (object_class,
                                    PROP_COLUMN_SPAN_COLUMN,
                                    g_param_spec_int ("column_span_column",
-                                                     _("Column span column"),
-
-                                                     _("TreeModel column containing the column span values"),
+                                                     P_("Column span column"),
+
+                                                     P_("TreeModel column containing the column span values"),
                                                      0,
                                                      G_MAXINT,
                                                      0,
@@ -526,8 +515,8 @@
   g_object_class_install_property (object_class,
                                    PROP_ACTIVE,
                                    g_param_spec_int ("active",
-                                                     _("Active item"),
-                                                     _("The item which is currently active"),
+                                                     P_("Active item"),
+                                                     P_("The item which is currently active"),
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
@@ -535,8 +524,8 @@
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_boolean ("appears-as-list",
-                                                                 _("Appears as list"),
-                                                                 _("Whether combobox dropdowns should look like lists rather than menus"),
+                                                                 P_("Appears as list"),
+                                                                 P_("Whether combobox dropdowns should look like lists rather than menus"),
                                                                  FALSE,
                                                                  G_PARAM_READABLE));
 }