Don't modify strings returned from gettext().

2005-06-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
	Don't modify strings returned from gettext().

ChangeLog

+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+	Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktextdisplay.c (render_para): don't use deprecated

ChangeLog.pre-2-10

+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+	Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktextdisplay.c (render_para): don't use deprecated

ChangeLog.pre-2-8

+2005-06-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): 
+	Don't modify strings returned from gettext().
+
 Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktextdisplay.c (render_para): don't use deprecated

gtk/gtkaccellabel.c

@@ -597,12 +597,17 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
       else 
 	{
 	  gchar msg[128];
+	  gchar *str;
       
 	  strcpy (msg, "keyboard label|");
 	  g_strlcat (msg, tmp, 128);
-	  tmp = g_strip_context (msg, dgettext (GETTEXT_PACKAGE, msg));
-	  substitute_underscores (tmp);
+	  str = dgettext (GETTEXT_PACKAGE, msg);
+	  if (str == msg)
+	    substitute_underscores (tmp);
+	  else
+	    tmp = str;
 	}
+
       g_string_append (gstring, tmp);
     }