*** gtk/gtkargcollector.c.orig	Tue Dec 15 17:07:33 1998
--- gtk/gtkargcollector.c	Tue Dec 15 17:12:42 1998
***************
*** 25,30 ****
--- 25,33 ----
   * gtk_arg_collect_value (GtkArg  *arg,
   *		          va_list  var_args);
   */
+ 
+ #include "gtkintl.h"
+ 
  #define	GTK_ARG_COLLECT_VALUE(arg, var_args, _error)	\
  G_STMT_START { \
    gchar *error_msg; \
***************
*** 42,48 ****
    switch (fundamental_type) \
      { \
      case GTK_TYPE_INVALID: \
!       error_msg = g_strdup ("invalid untyped argument"); \
        break; \
   \
      case GTK_TYPE_NONE: \
--- 45,51 ----
    switch (fundamental_type) \
      { \
      case GTK_TYPE_INVALID: \
!       error_msg = g_strdup (_("invalid untyped argument")); \
        break; \
   \
      case GTK_TYPE_NONE: \
***************
*** 50,56 ****
         * us to not move the var_args pointer any further. callers need to \
         * check for the validity of GTK_TYPE_NONE themselves. \
         * \
!        * error_msg = g_strdup ("invalid argument type `void'"); \
         */ \
        break; \
   \
--- 53,59 ----
         * us to not move the var_args pointer any further. callers need to \
         * check for the validity of GTK_TYPE_NONE themselves. \
         * \
!        * error_msg = g_strdup (_("invalid argument type `void'")); \
         */ \
        break; \
   \
***************
*** 146,159 ****
  	  register GtkObject *object = GTK_VALUE_OBJECT (*arg); \
  	   \
  	  if (object->klass == NULL) \
! 	    error_msg = g_strconcat ("invalid unclassed object pointer for argument type `", \
  				     gtk_type_name (arg->type), \
  				     "'", \
  				     NULL); \
  	  else if (!gtk_type_is_a (GTK_OBJECT_TYPE (object), arg->type)) \
! 	    error_msg = g_strconcat ("invalid object `", \
  				     gtk_type_name (GTK_OBJECT_TYPE (object)), \
! 				     "' for argument type `", \
  				     gtk_type_name (arg->type), \
  				     "'", \
  				     NULL); \
--- 149,162 ----
  	  register GtkObject *object = GTK_VALUE_OBJECT (*arg); \
  	   \
  	  if (object->klass == NULL) \
! 	    error_msg = g_strconcat (_("invalid unclassed object pointer for argument type `"), \
  				     gtk_type_name (arg->type), \
  				     "'", \
  				     NULL); \
  	  else if (!gtk_type_is_a (GTK_OBJECT_TYPE (object), arg->type)) \
! 	    error_msg = g_strconcat (_("invalid object `"), \
  				     gtk_type_name (GTK_OBJECT_TYPE (object)), \
! 				     _("' for argument type `"), \
  				     gtk_type_name (arg->type), \
  				     "'", \
  				     NULL); \
***************
*** 161,167 ****
        break; \
   \
      default: \
!       error_msg = g_strconcat ("unsupported argument type `", \
  			       gtk_type_name (arg->type), \
  			       "'", \
  			       NULL); \
--- 164,170 ----
        break; \
   \
      default: \
!       error_msg = g_strconcat (_("unsupported argument type `"), \
  			       gtk_type_name (arg->type), \
  			       "'", \
  			       NULL); \
*** gtk/gtkarg.c.orig	Tue Dec 15 18:20:03 1998
--- gtk/gtkarg.c	Tue Dec 15 18:19:44 1998
***************
*** 20,25 ****
--- 20,26 ----
  #include <string.h>
  #include "gtkobject.h"
  #include "gtkargcollector.c"
+ #include "gtkintl.h"
  
  
  #define	MAX_ARG_LENGTH	(256)
***************
*** 151,157 ****
    /* security audit
     */
    if (!arg_name || strlen (arg_name) > MAX_ARG_LENGTH - 8)
!     return g_strdup ("argument name exceeds maximum size.");
  
    /* split off the object-type part
     */
--- 152,158 ----
    /* security audit
     */
    if (!arg_name || strlen (arg_name) > MAX_ARG_LENGTH - 8)
!     return g_strdup (_("argument name exceeds maximum size."));
  
    /* split off the object-type part
     */
*** gtk/gtkcolorsel.c.orig	Tue Dec 15 18:46:20 1998
--- gtk/gtkcolorsel.c	Tue Dec 15 18:47:38 1998
***************
*** 199,211 ****
  
  static const scale_val_type scale_vals[NUM_CHANNELS] =
  {
!   {"Hue:",        0.0, 360.0, 1.00, 10.00, (SF) gtk_color_selection_hsv_updater},
!   {"Saturation:", 0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_hsv_updater},
!   {"Value:",      0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_hsv_updater},
!   {"Red:",        0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {"Green:",      0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {"Blue:",       0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {"Opacity:",    0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_opacity_updater}
  };
  
  guint
--- 199,211 ----
  
  static const scale_val_type scale_vals[NUM_CHANNELS] =
  {
!   {N_("Hue:"),        0.0, 360.0, 1.00, 10.00, (SF) gtk_color_selection_hsv_updater},
!   {N_("Saturation:"), 0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_hsv_updater},
!   {N_("Value:"),      0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_hsv_updater},
!   {N_("Red:"),        0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {N_("Green:"),      0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {N_("Blue:"),       0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_rgb_updater},
!   {N_("Opacity:"),    0.0,   1.0, 0.01,  0.01, (SF) gtk_color_selection_opacity_updater}
  };
  
  guint
***************
*** 1633,1650 ****
    gtk_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0);
    gtk_widget_show (action_area);
  
!   colorseldiag->ok_button = gtk_button_new_with_label ("OK");
    GTK_WIDGET_SET_FLAGS (colorseldiag->ok_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->ok_button, TRUE, TRUE, 0);
    gtk_widget_grab_default (colorseldiag->ok_button);
    gtk_widget_show (colorseldiag->ok_button);
  
!   colorseldiag->cancel_button = gtk_button_new_with_label ("Cancel");
    GTK_WIDGET_SET_FLAGS (colorseldiag->cancel_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->cancel_button, TRUE, TRUE, 0);
    gtk_widget_show (colorseldiag->cancel_button);
  
!   colorseldiag->help_button = gtk_button_new_with_label ("Help");
    GTK_WIDGET_SET_FLAGS (colorseldiag->help_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->help_button, TRUE, TRUE, 0);
    gtk_widget_show (colorseldiag->help_button);
--- 1633,1650 ----
    gtk_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0);
    gtk_widget_show (action_area);
  
!   colorseldiag->ok_button = gtk_button_new_with_label (_("OK"));
    GTK_WIDGET_SET_FLAGS (colorseldiag->ok_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->ok_button, TRUE, TRUE, 0);
    gtk_widget_grab_default (colorseldiag->ok_button);
    gtk_widget_show (colorseldiag->ok_button);
  
!   colorseldiag->cancel_button = gtk_button_new_with_label (_("Cancel"));
    GTK_WIDGET_SET_FLAGS (colorseldiag->cancel_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->cancel_button, TRUE, TRUE, 0);
    gtk_widget_show (colorseldiag->cancel_button);
  
!   colorseldiag->help_button = gtk_button_new_with_label (_("Help"));
    GTK_WIDGET_SET_FLAGS (colorseldiag->help_button, GTK_CAN_DEFAULT);
    gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->help_button, TRUE, TRUE, 0);
    gtk_widget_show (colorseldiag->help_button);
*** gtk/gtkfontsel.c.orig	Tue Dec 15 17:46:08 1998
--- gtk/gtkfontsel.c	Tue Dec 15 17:57:52 1998
***************
*** 82,87 ****
--- 82,88 ----
  #include "gtktable.h"
  #include "gtkvbox.h"
  #include "gtkscrolledwindow.h"
+ #include "gtkintl.h"
  
  /* The maximum number of fontnames requested with XListFonts(). */
  #define MAX_FONTS 32767
***************
*** 199,217 ****
  
  /* These are the names of the fields, used on the info & filter page. */
  static const gchar* xlfd_field_names[GTK_XLFD_NUM_FIELDS] = {
!   "Foundry:",
!   "Family:",
!   "Weight:",
!   "Slant:",
!   "Set Width:",
!   "Add Style:",
!   "Pixel Size:",
!   "Point Size:",
!   "Resolution X:",
!   "Resolution Y:",
!   "Spacing:",
!   "Average Width:",
!   "Charset:",
  };
  
  /* These are the array indices of the font properties used in several arrays,
--- 200,218 ----
  
  /* These are the names of the fields, used on the info & filter page. */
  static const gchar* xlfd_field_names[GTK_XLFD_NUM_FIELDS] = {
!   N_("Foundry:"),
!   N_("Family:"),
!   N_("Weight:"),
!   N_("Slant:"),
!   N_("Set Width:"),
!   N_("Add Style:"),
!   N_("Pixel Size:"),
!   N_("Point Size:"),
!   N_("Resolution X:"),
!   N_("Resolution Y:"),
!   N_("Spacing:"),
!   N_("Average Width:"),
!   N_("Charset:"),
  };
  
  /* These are the array indices of the font properties used in several arrays,
***************
*** 438,448 ****
    GtkWidget *text_box, *frame;
    GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment;
    gint i, prop, row;
!   gchar *titles[] = { "Font Property", "Requested Value", "Actual Value" };
    gchar buffer[128];
    gchar *size;
    gint size_to_match;
!   const gchar *row_text[3];
    gchar *property, *text;
    gboolean inserted;
    
--- 439,449 ----
    GtkWidget *text_box, *frame;
    GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment;
    gint i, prop, row;
!   gchar *titles[] = { _("Font Property"), _("Requested Value"), _("Actual Value") };
    gchar buffer[128];
    gchar *size;
    gint size_to_match;
!   gchar *row_text[3];
    gchar *property, *text;
    gboolean inserted;
    
***************
*** 477,483 ****
    fontsel->main_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->main_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6);
!   label = gtk_label_new("Font");
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->main_vbox, label);
    
--- 478,484 ----
    fontsel->main_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->main_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6);
!   label = gtk_label_new(_("Font"));
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->main_vbox, label);
    
***************
*** 487,503 ****
    gtk_table_set_col_spacings(GTK_TABLE(table), 8);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), table, TRUE, TRUE, 0);
    
!   fontsel->font_label = gtk_label_new("Font:");
    gtk_misc_set_alignment (GTK_MISC (fontsel->font_label), 0.0, 0.5);
    gtk_widget_show (fontsel->font_label);
    gtk_table_attach (GTK_TABLE (table), fontsel->font_label, 0, 1, 0, 1,
  		    GTK_FILL, 0, 0, 0);
!   label = gtk_label_new("Font Style:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
  		    GTK_FILL, 0, 0, 0);
!   label = gtk_label_new("Size:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
--- 488,504 ----
    gtk_table_set_col_spacings(GTK_TABLE(table), 8);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), table, TRUE, TRUE, 0);
    
!   fontsel->font_label = gtk_label_new(_("Font:"));
    gtk_misc_set_alignment (GTK_MISC (fontsel->font_label), 0.0, 0.5);
    gtk_widget_show (fontsel->font_label);
    gtk_table_attach (GTK_TABLE (table), fontsel->font_label, 0, 1, 0, 1,
  		    GTK_FILL, 0, 0, 0);
!   label = gtk_label_new(_("Font Style:"));
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
  		    GTK_FILL, 0, 0, 0);
!   label = gtk_label_new(_("Size:"));
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
***************
*** 629,635 ****
    gtk_widget_show (hbox);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), hbox, FALSE, TRUE, 0);
    
!   fontsel->filter_button = gtk_button_new_with_label("Reset Filter");
    gtk_misc_set_padding (GTK_MISC (GTK_BIN (fontsel->filter_button)->child),
  			16, 0);
    gtk_widget_show(fontsel->filter_button);
--- 630,636 ----
    gtk_widget_show (hbox);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), hbox, FALSE, TRUE, 0);
    
!   fontsel->filter_button = gtk_button_new_with_label(_("Reset Filter"));
    gtk_misc_set_padding (GTK_MISC (GTK_BIN (fontsel->filter_button)->child),
  			16, 0);
    gtk_widget_show(fontsel->filter_button);
***************
*** 643,660 ****
    gtk_widget_show (hbox2);
    gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
    
!   label = gtk_label_new("Metric:");
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 8);
    
!   fontsel->points_button = gtk_radio_button_new_with_label(NULL, "Points");
    gtk_widget_show (fontsel->points_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->points_button, FALSE, TRUE, 0);
    if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS)
      gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fontsel->points_button),
  				TRUE);
    
!   fontsel->pixels_button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(fontsel->points_button), "Pixels");
    gtk_widget_show (fontsel->pixels_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->pixels_button, FALSE, TRUE, 0);
    if (INITIAL_METRIC == GTK_FONT_METRIC_PIXELS)
--- 644,661 ----
    gtk_widget_show (hbox2);
    gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
    
!   label = gtk_label_new(_("Metric:"));
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 8);
    
!   fontsel->points_button = gtk_radio_button_new_with_label(NULL, _("Points"));
    gtk_widget_show (fontsel->points_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->points_button, FALSE, TRUE, 0);
    if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS)
      gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fontsel->points_button),
  				TRUE);
    
!   fontsel->pixels_button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(fontsel->points_button), _("Pixels"));
    gtk_widget_show (fontsel->pixels_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->pixels_button, FALSE, TRUE, 0);
    if (INITIAL_METRIC == GTK_FONT_METRIC_PIXELS)
***************
*** 670,676 ****
    
    
    /* create the text entry widget */
!   text_frame = gtk_frame_new ("Preview:");
    gtk_widget_show (text_frame);
    gtk_frame_set_shadow_type(GTK_FRAME(text_frame), GTK_SHADOW_ETCHED_IN);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), text_frame,
--- 671,677 ----
    
    
    /* create the text entry widget */
!   text_frame = gtk_frame_new (_("Preview:"));
    gtk_widget_show (text_frame);
    gtk_frame_set_shadow_type(GTK_FRAME(text_frame), GTK_SHADOW_ETCHED_IN);
    gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), text_frame,
***************
*** 699,705 ****
    fontsel->info_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->info_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2);
!   label = gtk_label_new("Font Information");
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->info_vbox, label);
    
--- 700,706 ----
    fontsel->info_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->info_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2);
!   label = gtk_label_new(_("Font Information"));
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->info_vbox, label);
    
***************
*** 724,730 ****
    row_text[2] = "";
    for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
      {
!       row_text[0] = xlfd_field_names[i];
        gtk_clist_append(GTK_CLIST(fontsel->info_clist), row_text);
        gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 0, 0, 4);
        gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4);
--- 725,731 ----
    row_text[2] = "";
    for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
      {
!       row_text[0] = gettext(xlfd_field_names[i]);
        gtk_clist_append(GTK_CLIST(fontsel->info_clist), row_text);
        gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 0, 0, 4);
        gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4);
***************
*** 732,738 ****
      }
    gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
    
!   label = gtk_label_new("Requested Font Name:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
--- 733,739 ----
      }
    gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
    
!   label = gtk_label_new(_("Requested Font Name:"));
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
***************
*** 743,749 ****
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
  		      fontsel->requested_font_name, FALSE, TRUE, 0);
    
!   label = gtk_label_new("Actual Font Name:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
--- 744,750 ----
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
  		      fontsel->requested_font_name, FALSE, TRUE, 0);
    
!   label = gtk_label_new(_("Actual Font Name:"));
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
***************
*** 754,760 ****
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
  		      fontsel->actual_font_name, FALSE, TRUE, 0);
    
!   sprintf(buffer, "%i fonts available with a total of %i styles.",
  	  fontsel_info->nfonts, fontsel_info->nstyles);
    label = gtk_label_new(buffer);
    gtk_widget_show (label);
--- 755,761 ----
    gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
  		      fontsel->actual_font_name, FALSE, TRUE, 0);
    
!   sprintf(buffer, _("%i fonts available with a total of %i styles."),
  	  fontsel_info->nfonts, fontsel_info->nstyles);
    label = gtk_label_new(buffer);
    gtk_widget_show (label);
***************
*** 769,775 ****
    fontsel->filter_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->filter_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2);
!   label = gtk_label_new("Filter");
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->filter_vbox, label);
    
--- 770,776 ----
    fontsel->filter_vbox = gtk_vbox_new (FALSE, 4);
    gtk_widget_show (fontsel->filter_vbox);
    gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2);
!   label = gtk_label_new(_("Filter"));
    gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
  			    fontsel->filter_vbox, label);
    
***************
*** 782,788 ****
    gtk_widget_show (hbox);
    gtk_container_add (GTK_CONTAINER (frame), hbox);
  
!   label = gtk_label_new("Font Types:");
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 10);
  
--- 783,789 ----
    gtk_widget_show (hbox);
    gtk_container_add (GTK_CONTAINER (frame), hbox);
  
!   label = gtk_label_new(_("Font Types:"));
    gtk_widget_show (label);
    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 10);
  
***************
*** 790,808 ****
    gtk_widget_show (hbox2);
    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, TRUE, 0);
  
!   fontsel->type_bitmaps_button = gtk_check_button_new_with_label ("Bitmap");
    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), TRUE);
    gtk_widget_show (fontsel->type_bitmaps_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_bitmaps_button,
  		      FALSE, TRUE, 0);
  
!   fontsel->type_scalable_button = gtk_check_button_new_with_label ("Scalable");
    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), TRUE);
    gtk_widget_show (fontsel->type_scalable_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scalable_button,
  		      FALSE, TRUE, 0);
  
!   fontsel->type_scaled_bitmaps_button = gtk_check_button_new_with_label ("Scaled Bitmap");
    gtk_widget_show (fontsel->type_scaled_bitmaps_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scaled_bitmaps_button,
  		      FALSE, TRUE, 0);
--- 791,809 ----
    gtk_widget_show (hbox2);
    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, TRUE, 0);
  
!   fontsel->type_bitmaps_button = gtk_check_button_new_with_label (_("Bitmap"));
    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), TRUE);
    gtk_widget_show (fontsel->type_bitmaps_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_bitmaps_button,
  		      FALSE, TRUE, 0);
  
!   fontsel->type_scalable_button = gtk_check_button_new_with_label (_("Scalable"));
    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), TRUE);
    gtk_widget_show (fontsel->type_scalable_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scalable_button,
  		      FALSE, TRUE, 0);
  
!   fontsel->type_scaled_bitmaps_button = gtk_check_button_new_with_label (_("Scaled Bitmap"));
    gtk_widget_show (fontsel->type_scaled_bitmaps_button);
    gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scaled_bitmaps_button,
  		      FALSE, TRUE, 0);
***************
*** 817,823 ****
        gint left = filter_positions[prop][0];
        gint top = filter_positions[prop][1];
        
!       label = gtk_label_new(xlfd_field_names[xlfd_index[prop]]);
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
        gtk_misc_set_padding (GTK_MISC (label), 0, 2);
        gtk_widget_show(label);
--- 818,824 ----
        gint left = filter_positions[prop][0];
        gint top = filter_positions[prop][1];
        
!       label = gtk_label_new(gettext(xlfd_field_names[xlfd_index[prop]]));
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
        gtk_misc_set_padding (GTK_MISC (label), 0, 2);
        gtk_widget_show(label);
***************
*** 851,857 ****
  	  gtk_widget_show(alignment);
  	  gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 4);
  	  
! 	  button = gtk_button_new_with_label("Reset Filter");
  	  gtk_widget_show(button);
  	  gtk_container_add(GTK_CONTAINER(alignment), button);
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
--- 852,858 ----
  	  gtk_widget_show(alignment);
  	  gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 4);
  	  
! 	  button = gtk_button_new_with_label(_("Reset Filter"));
  	  gtk_widget_show(button);
  	  gtk_container_add(GTK_CONTAINER(alignment), button);
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
***************
*** 1198,1221 ****
  	  spacing   = fontsel_info->properties[SPACING]  [spacing_index];
  	  
  	  /* Convert '(nil)' weights to 'regular', since it looks nicer. */
! 	  if      (!g_strcasecmp(weight, "(nil)"))	weight = "regular";
  	  
  	  /* We don't show default values or (nil) in the other properties. */
  	  if      (!g_strcasecmp(slant, "r"))        slant = NULL;
  	  else if (!g_strcasecmp(slant, "(nil)"))    slant = NULL;
! 	  else if (!g_strcasecmp(slant, "i"))        slant = "italic";
! 	  else if (!g_strcasecmp(slant, "o"))        slant = "oblique";
! 	  else if (!g_strcasecmp(slant, "ri"))       slant = "reverse italic";
! 	  else if (!g_strcasecmp(slant, "ro"))       slant = "reverse oblique";
! 	  else if (!g_strcasecmp(slant, "ot"))       slant = "other";
  	  
  	  if      (!g_strcasecmp(set_width, "normal")) set_width = NULL;
  	  else if (!g_strcasecmp(set_width, "(nil)"))  set_width = NULL;
  	  
  	  if      (!g_strcasecmp(spacing, "p"))        spacing = NULL;
  	  else if (!g_strcasecmp(spacing, "(nil)"))    spacing = NULL;
! 	  else if (!g_strcasecmp(spacing, "m"))        spacing = "[M]";
! 	  else if (!g_strcasecmp(spacing, "c"))        spacing = "[C]";
  	  
  	  /* Add the strings together, making sure there is 1 space between
  	     them */
--- 1199,1222 ----
  	  spacing   = fontsel_info->properties[SPACING]  [spacing_index];
  	  
  	  /* Convert '(nil)' weights to 'regular', since it looks nicer. */
! 	  if      (!g_strcasecmp(weight, "(nil)"))	weight = _("regular");
  	  
  	  /* We don't show default values or (nil) in the other properties. */
  	  if      (!g_strcasecmp(slant, "r"))        slant = NULL;
  	  else if (!g_strcasecmp(slant, "(nil)"))    slant = NULL;
! 	  else if (!g_strcasecmp(slant, "i"))        slant = _("italic");
! 	  else if (!g_strcasecmp(slant, "o"))        slant = _("oblique");
! 	  else if (!g_strcasecmp(slant, "ri"))       slant = _("reverse italic");
! 	  else if (!g_strcasecmp(slant, "ro"))       slant = _("reverse oblique");
! 	  else if (!g_strcasecmp(slant, "ot"))       slant = _("other");
  	  
  	  if      (!g_strcasecmp(set_width, "normal")) set_width = NULL;
  	  else if (!g_strcasecmp(set_width, "(nil)"))  set_width = NULL;
  	  
  	  if      (!g_strcasecmp(spacing, "p"))        spacing = NULL;
  	  else if (!g_strcasecmp(spacing, "(nil)"))    spacing = NULL;
! 	  else if (!g_strcasecmp(spacing, "m"))        spacing = _("[M]");
! 	  else if (!g_strcasecmp(spacing, "c"))        spacing = _("[C]");
  	  
  	  /* Add the strings together, making sure there is 1 space between
  	     them */
***************
*** 1759,1771 ****
        else 
  	{
  	  gtk_label_set(GTK_LABEL(fontsel->message_label),
! 			"The selected font is not available.");
  	}
      }
    else
      {
        gtk_label_set(GTK_LABEL(fontsel->message_label),
! 		    "The selected font is not a valid font.");
      }
    
    return FALSE;
--- 1760,1772 ----
        else 
  	{
  	  gtk_label_set(GTK_LABEL(fontsel->message_label),
! 			_("The selected font is not available."));
  	}
      }
    else
      {
        gtk_label_set(GTK_LABEL(fontsel->message_label),
! 		    _("The selected font is not a valid font."));
      }
    
    return FALSE;
***************
*** 1823,1829 ****
    xfs = GDK_FONT_XFONT(fontsel->font);
    if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0)
      gtk_label_set(GTK_LABEL(fontsel->message_label),
! 		  "This is a 2-byte font and may not be displayed correctly.");
  }
  
  
--- 1824,1830 ----
    xfs = GDK_FONT_XFONT(fontsel->font);
    if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0)
      gtk_label_set(GTK_LABEL(fontsel->message_label),
! 		  _("This is a 2-byte font and may not be displayed correctly."));
  }
  
  
***************
*** 1915,1921 ****
        for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
  	{
  	  gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
! 			     fontname ? "(unknown)" : "");
  	}
      }
    gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
--- 1916,1922 ----
        for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
  	{
  	  gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
! 			     fontname ? _("(unknown)") : "");
  	}
      }
    gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
***************
*** 1926,1946 ****
  static gchar*
  gtk_font_selection_expand_slant_code(gchar *slant)
  {
!   if      (!g_strcasecmp(slant, "r"))   return("roman");
!   else if (!g_strcasecmp(slant, "i"))   return("italic");
!   else if (!g_strcasecmp(slant, "o"))   return("oblique");
!   else if (!g_strcasecmp(slant, "ri"))  return("reverse italic");
!   else if (!g_strcasecmp(slant, "ro"))  return("reverse oblique");
!   else if (!g_strcasecmp(slant, "ot"))  return("other");
    return slant;
  }
  
  static gchar*
  gtk_font_selection_expand_spacing_code(gchar *spacing)
  {
!   if      (!g_strcasecmp(spacing, "p")) return("proportional");
!   else if (!g_strcasecmp(spacing, "m")) return("monospaced");
!   else if (!g_strcasecmp(spacing, "c")) return("char cell");
    return spacing;
  }
  
--- 1927,1947 ----
  static gchar*
  gtk_font_selection_expand_slant_code(gchar *slant)
  {
!   if      (!g_strcasecmp(slant, "r"))   return(_("roman"));
!   else if (!g_strcasecmp(slant, "i"))   return(_("italic"));
!   else if (!g_strcasecmp(slant, "o"))   return(_("oblique"));
!   else if (!g_strcasecmp(slant, "ri"))  return(_("reverse italic"));
!   else if (!g_strcasecmp(slant, "ro"))  return(_("reverse oblique"));
!   else if (!g_strcasecmp(slant, "ot"))  return(_("other"));
    return slant;
  }
  
  static gchar*
  gtk_font_selection_expand_spacing_code(gchar *spacing)
  {
!   if      (!g_strcasecmp(spacing, "p")) return(_("proportional"));
!   else if (!g_strcasecmp(spacing, "m")) return(_("monospaced"));
!   else if (!g_strcasecmp(spacing, "c")) return(_("char cell"));
    return spacing;
  }
  
***************
*** 2135,2146 ****
    if (default_filter)
      {
        gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
!       gtk_label_set(GTK_LABEL(fontsel->font_label), "Font:");
      }
    else
      {
        gtk_widget_set_sensitive(fontsel->filter_button, TRUE);
!       gtk_label_set(GTK_LABEL(fontsel->font_label), "Font: (Filter Applied)");
      }
    gtk_font_selection_show_available_fonts(fontsel);
  }  
--- 2136,2147 ----
    if (default_filter)
      {
        gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
!       gtk_label_set(GTK_LABEL(fontsel->font_label), _("Font:"));
      }
    else
      {
        gtk_widget_set_sensitive(fontsel->filter_button, TRUE);
!       gtk_label_set(GTK_LABEL(fontsel->font_label), _("Font: (Filter Applied)"));
      }
    gtk_font_selection_show_available_fonts(fontsel);
  }  
***************
*** 2365,2371 ****
    
    /* Update the main notebook page. */
    gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
!   gtk_label_set(GTK_LABEL(fontsel->font_label), "Font:");
    
    gtk_font_selection_show_available_fonts(fontsel);
  }
--- 2366,2372 ----
    
    /* Update the main notebook page. */
    gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
!   gtk_label_set(GTK_LABEL(fontsel->font_label), _("Font:"));
    
    gtk_font_selection_show_available_fonts(fontsel);
  }
***************
*** 2616,2622 ****
    xfontnames = XListFonts (GDK_DISPLAY(), "-*", MAX_FONTS, &num_fonts);
    /* Output a warning if we actually get MAX_FONTS fonts. */
    if (num_fonts == MAX_FONTS)
!     g_warning("MAX_FONTS exceeded. Some fonts may be missing.");
    
    /* The maximum size of all these tables is the number of font names
       returned. We realloc them later when we know exactly how many
--- 2617,2623 ----
    xfontnames = XListFonts (GDK_DISPLAY(), "-*", MAX_FONTS, &num_fonts);
    /* Output a warning if we actually get MAX_FONTS fonts. */
    if (num_fonts == MAX_FONTS)
!     g_warning(_("MAX_FONTS exceeded. Some fonts may be missing."));
    
    /* The maximum size of all these tables is the number of font names
       returned. We realloc them later when we know exactly how many
***************
*** 3454,3473 ****
  		      fontseldiag->action_area, FALSE, FALSE, 0);
    gtk_widget_show (fontseldiag->action_area);
    
!   fontseldiag->ok_button = gtk_button_new_with_label("OK");
    GTK_WIDGET_SET_FLAGS (fontseldiag->ok_button, GTK_CAN_DEFAULT);
    gtk_widget_show(fontseldiag->ok_button);
    gtk_box_pack_start (GTK_BOX (fontseldiag->action_area),
  		      fontseldiag->ok_button, TRUE, TRUE, 0);
    gtk_widget_grab_default (fontseldiag->ok_button);
    
!   fontseldiag->apply_button = gtk_button_new_with_label("Apply");
    GTK_WIDGET_SET_FLAGS (fontseldiag->apply_button, GTK_CAN_DEFAULT);
    /*gtk_widget_show(fontseldiag->apply_button);*/
    gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
  		      fontseldiag->apply_button, TRUE, TRUE, 0);
    
!   fontseldiag->cancel_button = gtk_button_new_with_label("Cancel");
    GTK_WIDGET_SET_FLAGS (fontseldiag->cancel_button, GTK_CAN_DEFAULT);
    gtk_widget_show(fontseldiag->cancel_button);
    gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
--- 3455,3474 ----
  		      fontseldiag->action_area, FALSE, FALSE, 0);
    gtk_widget_show (fontseldiag->action_area);
    
!   fontseldiag->ok_button = gtk_button_new_with_label(_("OK"));
    GTK_WIDGET_SET_FLAGS (fontseldiag->ok_button, GTK_CAN_DEFAULT);
    gtk_widget_show(fontseldiag->ok_button);
    gtk_box_pack_start (GTK_BOX (fontseldiag->action_area),
  		      fontseldiag->ok_button, TRUE, TRUE, 0);
    gtk_widget_grab_default (fontseldiag->ok_button);
    
!   fontseldiag->apply_button = gtk_button_new_with_label(_("Apply"));
    GTK_WIDGET_SET_FLAGS (fontseldiag->apply_button, GTK_CAN_DEFAULT);
    /*gtk_widget_show(fontseldiag->apply_button);*/
    gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
  		      fontseldiag->apply_button, TRUE, TRUE, 0);
    
!   fontseldiag->cancel_button = gtk_button_new_with_label(_("Cancel"));
    GTK_WIDGET_SET_FLAGS (fontseldiag->cancel_button, GTK_CAN_DEFAULT);
    gtk_widget_show(fontseldiag->cancel_button);
    gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
***************
*** 3483,3489 ****
    
    fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG);
    gtk_window_set_title (GTK_WINDOW (fontseldiag),
! 			title ? title : "Font Selection");
    
    return GTK_WIDGET (fontseldiag);
  }
--- 3484,3490 ----
    
    fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG);
    gtk_window_set_title (GTK_WINDOW (fontseldiag),
! 			title ? title : _("Font Selection"));
    
    return GTK_WIDGET (fontseldiag);
  }
*** gtk/gtkgamma.c.orig	Tue Dec 15 17:42:49 1998
--- gtk/gtkgamma.c	Tue Dec 15 17:43:53 1998
***************
*** 34,39 ****
--- 34,40 ----
  #include "gtktable.h"
  #include "gtkvbox.h"
  #include "gtkwindow.h"
+ #include "gtkintl.h"
  
  static GtkVBoxClass *parent_class = NULL;
  
***************
*** 384,397 ****
  	  gchar buf[64];
  	  
  	  c->gamma_dialog = gtk_dialog_new ();
! 	  gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), "Gamma");
  	  vbox = GTK_DIALOG (c->gamma_dialog)->vbox;
  	  
  	  hbox = gtk_hbox_new (/* homogeneous */ FALSE, 0);
  	  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);
  	  gtk_widget_show (hbox);
  	  
! 	  label = gtk_label_new ("Gamma value");
  	  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
  	  gtk_widget_show (label);
  	  
--- 385,398 ----
  	  gchar buf[64];
  	  
  	  c->gamma_dialog = gtk_dialog_new ();
! 	  gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), _("Gamma"));
  	  vbox = GTK_DIALOG (c->gamma_dialog)->vbox;
  	  
  	  hbox = gtk_hbox_new (/* homogeneous */ FALSE, 0);
  	  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);
  	  gtk_widget_show (hbox);
  	  
! 	  label = gtk_label_new (_("Gamma value"));
  	  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
  	  gtk_widget_show (label);
  	  
***************
*** 404,410 ****
  	  /* fill in action area: */
  	  hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
  	  
! 	  button = gtk_button_new_with_label ("OK");
  	  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
  			      (GtkSignalFunc) gamma_ok_callback, c);
--- 405,411 ----
  	  /* fill in action area: */
  	  hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
  	  
! 	  button = gtk_button_new_with_label (_("OK"));
  	  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
  			      (GtkSignalFunc) gamma_ok_callback, c);
***************
*** 412,418 ****
  	  gtk_widget_grab_default (button);
  	  gtk_widget_show (button);
  	  
! 	  button = gtk_button_new_with_label ("Cancel");
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
  			      (GtkSignalFunc) gamma_cancel_callback, c);
  	  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
--- 413,419 ----
  	  gtk_widget_grab_default (button);
  	  gtk_widget_show (button);
  	  
! 	  button = gtk_button_new_with_label (_("Cancel"));
  	  gtk_signal_connect (GTK_OBJECT (button), "clicked",
  			      (GtkSignalFunc) gamma_cancel_callback, c);
  	  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
*** gtk/gtknotebook.c.orig	Tue Dec 15 18:34:21 1998
--- gtk/gtknotebook.c	Tue Dec 15 18:35:10 1998
***************
*** 25,30 ****
--- 25,31 ----
  #include "gtklabel.h"
  #include <gdk/gdkkeysyms.h>
  #include <stdio.h>
+ #include "gtkintl.h"
  
  
  #define TAB_OVERLAP    2
***************
*** 1943,1949 ****
         list = gtk_notebook_search_page (notebook, list, STEP_NEXT, FALSE))
      {
        page = list->data;
!       sprintf (string, "Page %u", page_num++);
        if (notebook->show_tabs)
  	{
  	  if (page->default_tab)
--- 1944,1950 ----
         list = gtk_notebook_search_page (notebook, list, STEP_NEXT, FALSE))
      {
        page = list->data;
!       sprintf (string, _("Page %u"), page_num++);
        if (notebook->show_tabs)
  	{
  	  if (page->default_tab)
***************
*** 3963,3969 ****
  	{
  	  gchar string[32];
  
! 	  sprintf (string, "Page %u", 
  		   gtk_notebook_real_page_position (notebook, list));
  	  page->tab_label = gtk_label_new (string);
  	  gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
--- 3964,3970 ----
  	{
  	  gchar string[32];
  
! 	  sprintf (string, _("Page %u"), 
  		   gtk_notebook_real_page_position (notebook, list));
  	  page->tab_label = gtk_label_new (string);
  	  gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));
*** gtk/gtkrc.c.orig	Tue Dec 15 17:37:36 1998
--- gtk/gtkrc.c	Tue Dec 15 17:37:57 1998
***************
*** 29,34 ****
--- 29,35 ----
  #include "gtkrc.h"
  #include "gtkbindings.h"
  #include "gtkthemes.h"
+ #include "gtkintl.h"
  
  typedef struct _GtkRcSet    GtkRcSet;
  typedef struct _GtkRcNode   GtkRcNode;
***************
*** 449,460 ****
         */
        for (j=n_locale_suffixes-1; j>=0; j--)
  	{
  	  gchar *name = g_strconcat (gtk_rc_default_files[i],
  				     ".",
  				     locale_suffixes[j],
  				     NULL);
  	  gtk_rc_parse (name);
- 	  g_free (name);
  	}
  
        gtk_rc_parse (gtk_rc_default_files[i]);
--- 450,461 ----
         */
        for (j=n_locale_suffixes-1; j>=0; j--)
  	{
+ 	  struct stat statbuf;
  	  gchar *name = g_strconcat (gtk_rc_default_files[i],
  				     ".",
  				     locale_suffixes[j],
  				     NULL);
  	  gtk_rc_parse (name);
  	}
  
        gtk_rc_parse (gtk_rc_default_files[i]);
***************
*** 1529,1538 ****
      }
  
    if (scanner)
!     g_warning ("Unable to locate image file in pixmap_path: \"%s\" line %d",
  	       pixmap_file, scanner->line);
    else
!     g_warning ("Unable to locate image file in pixmap_path: \"%s\"",
  	       pixmap_file);
      
    return NULL;
--- 1530,1539 ----
      }
  
    if (scanner)
!     g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
  	       pixmap_file, scanner->line);
    else
!     g_warning (_("Unable to locate image file in pixmap_path: \"%s\""),
  	       pixmap_file);
      
    return NULL;
*** gtk/gtkthemes.c.orig	Tue Dec 15 18:23:48 1998
--- gtk/gtkthemes.c	Tue Dec 15 18:42:50 1998
***************
*** 28,33 ****
--- 28,34 ----
  #include "gtkwidget.h"
  #include "gtkprivate.h"
  #include "config.h"
+ #include "gtkintl.h"
  
  typedef struct _GtkThemeEnginePrivate GtkThemeEnginePrivate;
  
***************
*** 68,74 ****
  
         if (!engine_path)
  	 {
! 	   g_warning ("Unable to locate loadable module in module_path: \"%s\",",
  		      fullname);
  	   
  	   return NULL;
--- 69,75 ----
  
         if (!engine_path)
  	 {
! 	   g_warning (_("Unable to locate loadable module in module_path: \"%s\","),
  		      fullname);
  	   
  	   return NULL;
***************
*** 76,82 ****
         
         /* load the lib */
         
!        printf ("Loading Theme %s\n", engine_path);
         
         library = g_module_open (engine_path, 0);
         g_free(engine_path);
--- 77,83 ----
         
         /* load the lib */
         
!        printf (_("Loading Theme %s\n"), engine_path);
         
         library = g_module_open (engine_path, 0);
         g_free(engine_path);
*** gtk/gtktipsquery.c.orig	Tue Dec 15 17:34:10 1998
--- gtk/gtktipsquery.c	Tue Dec 15 17:34:19 1998
***************
*** 23,28 ****
--- 23,29 ----
  #include	"gtksignal.h"
  #include	"gtktooltips.h"
  #include	"gtkmain.h"
+ #include	"gtkintl.h"
  
  
  
***************
*** 168,174 ****
    tips_query->emit_always = FALSE;
    tips_query->in_query = FALSE;
    tips_query->label_inactive = g_strdup ("");
!   tips_query->label_no_tip = g_strdup ("--- No Tip ---");
    tips_query->caller = NULL;
    tips_query->last_crossed = NULL;
    tips_query->query_cursor = NULL;
--- 169,175 ----
    tips_query->emit_always = FALSE;
    tips_query->in_query = FALSE;
    tips_query->label_inactive = g_strdup ("");
!   tips_query->label_no_tip = g_strdup (_("--- No Tip ---"));
    tips_query->caller = NULL;
    tips_query->last_crossed = NULL;
    tips_query->query_cursor = NULL;
*** gtk/gtkwidget.c.orig	Tue Dec 15 17:11:31 1998
--- gtk/gtkwidget.c	Tue Dec 15 17:12:05 1998
***************
*** 29,35 ****
  #include "gtkprivate.h"
  #include "gdk/gdk.h"
  #include "gdk/gdkx.h"
! 
  
  #define WIDGET_CLASS(w)	 GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
  #define	INIT_PATH_SIZE	(512)
--- 29,35 ----
  #include "gtkprivate.h"
  #include "gdk/gdk.h"
  #include "gdk/gdkx.h"
! #include "gtkintl.h"
  
  #define WIDGET_CLASS(w)	 GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
  #define	INIT_PATH_SIZE	(512)
***************
*** 2611,2617 ****
        signal_num = VISIBILITY_NOTIFY_EVENT;
        break;
      default:
!       g_warning ("could not determine signal number for event: %d", event->type);
        gtk_widget_unref (widget);
        return TRUE;
      }
--- 2611,2617 ----
        signal_num = VISIBILITY_NOTIFY_EVENT;
        break;
      default:
!       g_warning (_("could not determine signal number for event: %d"), event->type);
        gtk_widget_unref (widget);
        return TRUE;
      }
*** po/de.po.orig	Tue Dec 15 02:32:09 1998
--- po/de.po	Tue Dec 15 18:04:20 1998
***************
*** 1,14 ****
! # SOME DESCRIPTIVE TITLE.
! # Copyright (C) YEAR Free Software Foundation, Inc.
! # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
- #, fuzzy
  msgid ""
  msgstr ""
  "Project-Id-Version: gtk+ 1.1.8\n"
! "POT-Creation-Date: 1998-12-15 02:21+0100\n"
  "PO-Revision-Date: 1998-12-15 02:21+0100\n"
! "Last-Translator: Sven Neumann <sven@gimp.org>\n"
  "Language-Team: German <de@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=iso-8859-1\n"
--- 1,13 ----
! # This is the German locale definition for Gtk+.
! # Copyright (C) 1998 Free Software Foundation, Inc.
! # Daniel Egger <Daniel.Egger@t-online>, 1998.
  #
  msgid ""
  msgstr ""
  "Project-Id-Version: gtk+ 1.1.8\n"
! "POT-Creation-Date: 1998-12-15 18:01+0100\n"
  "PO-Revision-Date: 1998-12-15 02:21+0100\n"
! "Last-Translator: Daniel Egger <Daniel.Egger@t-online.de>\n"
  "Language-Team: German <de@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=iso-8859-1\n"
*** po/POTFILES.in.orig	Mon Dec 14 18:39:37 1998
--- po/POTFILES.in	Tue Dec 15 19:45:26 1998
***************
*** 1,5 ****
  # Files from the Gtk ditribution which have already been
  # marked to allow runtime translation of messages
  
  gtk/gtkfilesel.c
! gtk/gtkcolorsel.c
\ No newline at end of file
--- 1,16 ----
  # Files from the Gtk ditribution which have already been
  # marked to allow runtime translation of messages
  
+ gtk/gtkarg.c
+ gtk/gtkargcollector.c
+ gtk/gtkcolorsel.c
  gtk/gtkfilesel.c
! gtk/gtkfontsel.c
! gtk/gtkgamma.c
! gtk/gtkinputdialog.c
! gtk/gtkmain.c
! gtk/gtknotebook.c
! gtk/gtkrc.c
! gtk/gtkthemes.c
! gtk/gtktipsquery.c
! gtk/gtkwidget.c
