AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add @INTLLIBS@. gtk-scier-981116-0.patch Sean Cier

Browse Source 
Thu Dec 17 20:33:28 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk-config.in: Add @INTLLIBS@.
	gtk-scier-981116-0.patch  Sean Cier <scier@PostHorizon.com>) ]

	* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
	  gtk/gtkgamma.c gtk/gtkinputdialog.c
	  gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
	  gtk/gtktipsquery.c:

	Applied parts of gtk-egger-981215-1 [ Daniel Egger
	<Daniel.Egger@t-online.de> ] marking additional strings for
	internationalization.

	* po/nl.po: Added Dutch translation from
	Paul Siegmann <pauls@euronet.nl>.
This commit is contained in:
Owen Taylor 1998-12-18 01:32:33 +00:00 committed by Owen Taylor
parent 1bde7a5599
commit 11339ec5b3
18 changed files with 355 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-0
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-10
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-2
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-4
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-6
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

23
ChangeLog.pre-2-8
View File

@ -1,3 +1,26 @@
Thu Dec 17 20:33:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk-config.in: Add @INTLLIBS@.
gtk-scier-981116-0.patch Sean Cier <scier@PostHorizon.com>) ]
* gtk/gtkcolorsel.c gtk/gtkfilesel.c gtk/gtkfontsel.c
gtk/gtkgamma.c gtk/gtkinputdialog.c
gtk/gtknotebook.c gtk/gtkrc.c gtk/gtkthemes.c
gtk/gtktipsquery.c:
Applied parts of gtk-egger-981215-1 [ Daniel Egger
<Daniel.Egger@t-online.de> ] marking additional strings for
internationalization.
* po/nl.po: Added Dutch translation from
Paul Siegmann <pauls@euronet.nl>.
Thu Dec 17 18:25:52 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
info tag from the context so if the source unexpectedly
responds in the future, we do nothing properly.
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com> Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle * gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle

2
configure.in
View File

@ -130,7 +130,7 @@ fi
AC_SUBST(REBUILD) AC_SUBST(REBUILD)
# i18n stuff # i18n stuff
ALL_LINGUAS="de pt" ALL_LINGUAS="de nl pt"
AM_GTK_GNU_GETTEXT AM_GTK_GNU_GETTEXT
AC_CHECK_FUNC(gettext, AC_CHECK_FUNC(gettext,
, ,

2
gtk-config.in
View File

@ -64,7 +64,7 @@ while test $# -gt 0; do
fi fi
fi fi
done done
echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
;; ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2

23
gtk/gtkcolorsel.c
View File

@ -23,6 +23,7 @@
#include "gtkcolorsel.h" #include "gtkcolorsel.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkhbbox.h" #include "gtkhbbox.h"
#include "gtkintl.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkselection.h" #include "gtkselection.h"
@ -198,13 +199,13 @@ static const gchar *value_index_key = "gtk-value-index";
static const scale_val_type scale_vals[NUM_CHANNELS] = static const scale_val_type scale_vals[NUM_CHANNELS] =
{ {
{"Hue:", 0.0, 360.0, 1.00, 10.00, (SF) gtk_color_selection_hsv_updater}, {N_("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}, {N_("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}, {N_("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}, {N_("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}, {N_("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}, {N_("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} {N_("Opacity:"), 0.0, 1.0, 0.01, 0.01, (SF) gtk_color_selection_opacity_updater}
}; };
guint guint
@ -388,7 +389,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
for (n = HUE; n <= OPACITY; n++) for (n = HUE; n <= OPACITY; n++)
{ {
label = gtk_label_new (scale_vals[n].label); label = gtk_label_new (gettext(scale_vals[n].label));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, n, n + 1); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, n, n + 1);
@ -1633,18 +1634,18 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
gtk_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (colorseldiag->main_vbox), action_area, FALSE, FALSE, 0);
gtk_widget_show (action_area); gtk_widget_show (action_area);
colorseldiag->ok_button = gtk_button_new_with_label ("OK"); colorseldiag->ok_button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (colorseldiag->ok_button, GTK_CAN_DEFAULT); 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_box_pack_start (GTK_BOX (action_area), colorseldiag->ok_button, TRUE, TRUE, 0);
gtk_widget_grab_default (colorseldiag->ok_button); gtk_widget_grab_default (colorseldiag->ok_button);
gtk_widget_show (colorseldiag->ok_button); gtk_widget_show (colorseldiag->ok_button);
colorseldiag->cancel_button = gtk_button_new_with_label ("Cancel"); colorseldiag->cancel_button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (colorseldiag->cancel_button, GTK_CAN_DEFAULT); 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_box_pack_start (GTK_BOX (action_area), colorseldiag->cancel_button, TRUE, TRUE, 0);
gtk_widget_show (colorseldiag->cancel_button); gtk_widget_show (colorseldiag->cancel_button);
colorseldiag->help_button = gtk_button_new_with_label ("Help"); colorseldiag->help_button = gtk_button_new_with_label (_("Help"));
GTK_WIDGET_SET_FLAGS (colorseldiag->help_button, GTK_CAN_DEFAULT); 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_box_pack_start (GTK_BOX (action_area), colorseldiag->help_button, TRUE, TRUE, 0);
gtk_widget_show (colorseldiag->help_button); gtk_widget_show (colorseldiag->help_button);

131
gtk/gtkfontsel.c
View File

@ -82,6 +82,7 @@
#include "gtktable.h" #include "gtktable.h"
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkintl.h"
/* The maximum number of fontnames requested with XListFonts(). */ /* The maximum number of fontnames requested with XListFonts(). */
#define MAX_FONTS 32767 #define MAX_FONTS 32767
@ -199,19 +200,19 @@ typedef enum
/* These are the names of the fields, used on the info & filter page. */ /* These are the names of the fields, used on the info & filter page. */
static const gchar* xlfd_field_names[GTK_XLFD_NUM_FIELDS] = { static const gchar* xlfd_field_names[GTK_XLFD_NUM_FIELDS] = {
"Foundry:", N_("Foundry:"),
"Family:", N_("Family:"),
"Weight:", N_("Weight:"),
"Slant:", N_("Slant:"),
"Set Width:", N_("Set Width:"),
"Add Style:", N_("Add Style:"),
"Pixel Size:", N_("Pixel Size:"),
"Point Size:", N_("Point Size:"),
"Resolution X:", N_("Resolution X:"),
"Resolution Y:", N_("Resolution Y:"),
"Spacing:", N_("Spacing:"),
"Average Width:", N_("Average Width:"),
"Charset:", N_("Charset:"),
}; };
/* These are the array indices of the font properties used in several arrays, /* These are the array indices of the font properties used in several arrays,
@ -438,11 +439,11 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
GtkWidget *text_box, *frame; GtkWidget *text_box, *frame;
GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment; GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment;
gint i, prop, row; gint i, prop, row;
gchar *titles[] = { "Font Property", "Requested Value", "Actual Value" }; gchar *titles[] = { _("Font Property"), _("Requested Value"), _("Actual Value") };
gchar buffer[128]; gchar buffer[128];
gchar *size; gchar *size;
gint size_to_match; gint size_to_match;
const gchar *row_text[3]; gchar *row_text[3];
gchar *property, *text; gchar *property, *text;
gboolean inserted; gboolean inserted;
@ -477,7 +478,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
fontsel->main_vbox = gtk_vbox_new (FALSE, 4); fontsel->main_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->main_vbox); gtk_widget_show (fontsel->main_vbox);
gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6); gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6);
label = gtk_label_new("Font"); label = gtk_label_new(_("Font"));
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->main_vbox, label); fontsel->main_vbox, label);
@ -487,17 +488,17 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_table_set_col_spacings(GTK_TABLE(table), 8); gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), table, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), table, TRUE, TRUE, 0);
fontsel->font_label = gtk_label_new("Font:"); fontsel->font_label = gtk_label_new(_("Font:"));
gtk_misc_set_alignment (GTK_MISC (fontsel->font_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (fontsel->font_label), 0.0, 0.5);
gtk_widget_show (fontsel->font_label); gtk_widget_show (fontsel->font_label);
gtk_table_attach (GTK_TABLE (table), fontsel->font_label, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (table), fontsel->font_label, 0, 1, 0, 1,
GTK_FILL, 0, 0, 0); GTK_FILL, 0, 0, 0);
label = gtk_label_new("Font Style:"); label = gtk_label_new(_("Font Style:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
GTK_FILL, 0, 0, 0); GTK_FILL, 0, 0, 0);
label = gtk_label_new("Size:"); label = gtk_label_new(_("Size:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
@ -629,7 +630,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_widget_show (hbox); gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), hbox, FALSE, TRUE, 0);
fontsel->filter_button = gtk_button_new_with_label("Reset Filter"); fontsel->filter_button = gtk_button_new_with_label(_("Reset Filter"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (fontsel->filter_button)->child), gtk_misc_set_padding (GTK_MISC (GTK_BIN (fontsel->filter_button)->child),
16, 0); 16, 0);
gtk_widget_show(fontsel->filter_button); gtk_widget_show(fontsel->filter_button);
@ -643,18 +644,18 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_widget_show (hbox2); gtk_widget_show (hbox2);
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
label = gtk_label_new("Metric:"); label = gtk_label_new(_("Metric:"));
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 8); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 8);
fontsel->points_button = gtk_radio_button_new_with_label(NULL, "Points"); fontsel->points_button = gtk_radio_button_new_with_label(NULL, _("Points"));
gtk_widget_show (fontsel->points_button); gtk_widget_show (fontsel->points_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->points_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox2), fontsel->points_button, FALSE, TRUE, 0);
if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS) if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS)
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fontsel->points_button), gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fontsel->points_button),
TRUE); TRUE);
fontsel->pixels_button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(fontsel->points_button), "Pixels"); 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_widget_show (fontsel->pixels_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->pixels_button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox2), fontsel->pixels_button, FALSE, TRUE, 0);
if (INITIAL_METRIC == GTK_FONT_METRIC_PIXELS) if (INITIAL_METRIC == GTK_FONT_METRIC_PIXELS)
@ -670,7 +671,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
/* create the text entry widget */ /* create the text entry widget */
text_frame = gtk_frame_new ("Preview:"); text_frame = gtk_frame_new (_("Preview:"));
gtk_widget_show (text_frame); gtk_widget_show (text_frame);
gtk_frame_set_shadow_type(GTK_FRAME(text_frame), GTK_SHADOW_ETCHED_IN); gtk_frame_set_shadow_type(GTK_FRAME(text_frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), text_frame, gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), text_frame,
@ -699,7 +700,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
fontsel->info_vbox = gtk_vbox_new (FALSE, 4); fontsel->info_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->info_vbox); gtk_widget_show (fontsel->info_vbox);
gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2); gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2);
label = gtk_label_new("Font Information"); label = gtk_label_new(_("Font Information"));
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->info_vbox, label); fontsel->info_vbox, label);
@ -724,7 +725,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
row_text[2] = ""; row_text[2] = "";
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++) for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{ {
row_text[0] = xlfd_field_names[i]; row_text[0] = gettext(xlfd_field_names[i]);
gtk_clist_append(GTK_CLIST(fontsel->info_clist), row_text); 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, 0, 0, 4);
gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4); gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4);
@ -732,7 +733,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
} }
gtk_clist_thaw (GTK_CLIST(fontsel->info_clist)); gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
label = gtk_label_new("Requested Font Name:"); label = gtk_label_new(_("Requested Font Name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
@ -743,7 +744,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
fontsel->requested_font_name, FALSE, TRUE, 0); fontsel->requested_font_name, FALSE, TRUE, 0);
label = gtk_label_new("Actual Font Name:"); label = gtk_label_new(_("Actual Font Name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
@ -754,7 +755,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
fontsel->actual_font_name, FALSE, TRUE, 0); fontsel->actual_font_name, FALSE, TRUE, 0);
sprintf(buffer, "%i fonts available with a total of %i styles.", sprintf(buffer, _("%i fonts available with a total of %i styles."),
fontsel_info->nfonts, fontsel_info->nstyles); fontsel_info->nfonts, fontsel_info->nstyles);
label = gtk_label_new(buffer); label = gtk_label_new(buffer);
gtk_widget_show (label); gtk_widget_show (label);
@ -769,7 +770,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
fontsel->filter_vbox = gtk_vbox_new (FALSE, 4); fontsel->filter_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->filter_vbox); gtk_widget_show (fontsel->filter_vbox);
gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2); gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2);
label = gtk_label_new("Filter"); label = gtk_label_new(_("Filter"));
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->filter_vbox, label); fontsel->filter_vbox, label);
@ -782,7 +783,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_widget_show (hbox); gtk_widget_show (hbox);
gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_container_add (GTK_CONTAINER (frame), hbox);
label = gtk_label_new("Font Types:"); label = gtk_label_new(_("Font Types:"));
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 10); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 10);
@ -790,19 +791,19 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_widget_show (hbox2); gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, TRUE, 0);
fontsel->type_bitmaps_button = gtk_check_button_new_with_label ("Bitmap"); 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_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), TRUE);
gtk_widget_show (fontsel->type_bitmaps_button); gtk_widget_show (fontsel->type_bitmaps_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_bitmaps_button, gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_bitmaps_button,
FALSE, TRUE, 0); FALSE, TRUE, 0);
fontsel->type_scalable_button = gtk_check_button_new_with_label ("Scalable"); 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_toggle_button_set_state (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), TRUE);
gtk_widget_show (fontsel->type_scalable_button); gtk_widget_show (fontsel->type_scalable_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scalable_button, gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scalable_button,
FALSE, TRUE, 0); FALSE, TRUE, 0);
fontsel->type_scaled_bitmaps_button = gtk_check_button_new_with_label ("Scaled Bitmap"); fontsel->type_scaled_bitmaps_button = gtk_check_button_new_with_label (_("Scaled Bitmap"));
gtk_widget_show (fontsel->type_scaled_bitmaps_button); gtk_widget_show (fontsel->type_scaled_bitmaps_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scaled_bitmaps_button, gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scaled_bitmaps_button,
FALSE, TRUE, 0); FALSE, TRUE, 0);
@ -817,7 +818,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gint left = filter_positions[prop][0]; gint left = filter_positions[prop][0];
gint top = filter_positions[prop][1]; gint top = filter_positions[prop][1];
label = gtk_label_new(xlfd_field_names[xlfd_index[prop]]); 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_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_misc_set_padding (GTK_MISC (label), 0, 2); gtk_misc_set_padding (GTK_MISC (label), 0, 2);
gtk_widget_show(label); gtk_widget_show(label);
@ -851,7 +852,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
gtk_widget_show(alignment); gtk_widget_show(alignment);
gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 4); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 4);
button = gtk_button_new_with_label("Reset Filter"); button = gtk_button_new_with_label(_("Reset Filter"));
gtk_widget_show(button); gtk_widget_show(button);
gtk_container_add(GTK_CONTAINER(alignment), button); gtk_container_add(GTK_CONTAINER(alignment), button);
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
@ -1198,24 +1199,24 @@ gtk_font_selection_show_available_styles (GtkFontSelection *fontsel)
spacing = fontsel_info->properties[SPACING] [spacing_index]; spacing = fontsel_info->properties[SPACING] [spacing_index];
/* Convert '(nil)' weights to 'regular', since it looks nicer. */ /* Convert '(nil)' weights to 'regular', since it looks nicer. */
if (!g_strcasecmp(weight, "(nil)")) weight = "regular"; if (!g_strcasecmp(weight, "(nil)")) weight = _("regular");
/* We don't show default values or (nil) in the other properties. */ /* We don't show default values or (nil) in the other properties. */
if (!g_strcasecmp(slant, "r")) slant = NULL; if (!g_strcasecmp(slant, "r")) slant = NULL;
else if (!g_strcasecmp(slant, "(nil)")) slant = NULL; else if (!g_strcasecmp(slant, "(nil)")) slant = NULL;
else if (!g_strcasecmp(slant, "i")) slant = "italic"; else if (!g_strcasecmp(slant, "i")) slant = _("italic");
else if (!g_strcasecmp(slant, "o")) slant = "oblique"; else if (!g_strcasecmp(slant, "o")) slant = _("oblique");
else if (!g_strcasecmp(slant, "ri")) slant = "reverse italic"; else if (!g_strcasecmp(slant, "ri")) slant = _("reverse italic");
else if (!g_strcasecmp(slant, "ro")) slant = "reverse oblique"; else if (!g_strcasecmp(slant, "ro")) slant = _("reverse oblique");
else if (!g_strcasecmp(slant, "ot")) slant = "other"; else if (!g_strcasecmp(slant, "ot")) slant = _("other");
if (!g_strcasecmp(set_width, "normal")) set_width = NULL; if (!g_strcasecmp(set_width, "normal")) set_width = NULL;
else if (!g_strcasecmp(set_width, "(nil)")) set_width = NULL; else if (!g_strcasecmp(set_width, "(nil)")) set_width = NULL;
if (!g_strcasecmp(spacing, "p")) spacing = NULL; if (!g_strcasecmp(spacing, "p")) spacing = NULL;
else if (!g_strcasecmp(spacing, "(nil)")) spacing = NULL; else if (!g_strcasecmp(spacing, "(nil)")) spacing = NULL;
else if (!g_strcasecmp(spacing, "m")) spacing = "[M]"; else if (!g_strcasecmp(spacing, "m")) spacing = _("[M]");
else if (!g_strcasecmp(spacing, "c")) spacing = "[C]"; else if (!g_strcasecmp(spacing, "c")) spacing = _("[C]");
/* Add the strings together, making sure there is 1 space between /* Add the strings together, making sure there is 1 space between
them */ them */
@ -1759,13 +1760,13 @@ gtk_font_selection_load_font (GtkFontSelection *fontsel)
else else
{ {
gtk_label_set_text(GTK_LABEL(fontsel->message_label), gtk_label_set_text(GTK_LABEL(fontsel->message_label),
"The selected font is not available."); _("The selected font is not available."));
} }
} }
else else
{ {
gtk_label_set_text(GTK_LABEL(fontsel->message_label), gtk_label_set_text(GTK_LABEL(fontsel->message_label),
"The selected font is not a valid font."); _("The selected font is not a valid font."));
} }
return FALSE; return FALSE;
@ -1823,7 +1824,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
xfs = GDK_FONT_XFONT(fontsel->font); xfs = GDK_FONT_XFONT(fontsel->font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0)
gtk_label_set_text(GTK_LABEL(fontsel->message_label), gtk_label_set_text(GTK_LABEL(fontsel->message_label),
"This is a 2-byte font and may not be displayed correctly."); _("This is a 2-byte font and may not be displayed correctly."));
} }
@ -1915,7 +1916,7 @@ gtk_font_selection_show_font_info (GtkFontSelection *fontsel)
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++) for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{ {
gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2, gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
fontname ? "(unknown)" : ""); fontname ? _("(unknown)") : "");
} }
} }
gtk_clist_thaw (GTK_CLIST(fontsel->info_clist)); gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
@ -1926,21 +1927,21 @@ gtk_font_selection_show_font_info (GtkFontSelection *fontsel)
static gchar* static gchar*
gtk_font_selection_expand_slant_code(gchar *slant) gtk_font_selection_expand_slant_code(gchar *slant)
{ {
if (!g_strcasecmp(slant, "r")) return("roman"); if (!g_strcasecmp(slant, "r")) return(_("roman"));
else if (!g_strcasecmp(slant, "i")) return("italic"); else if (!g_strcasecmp(slant, "i")) return(_("italic"));
else if (!g_strcasecmp(slant, "o")) return("oblique"); else if (!g_strcasecmp(slant, "o")) return(_("oblique"));
else if (!g_strcasecmp(slant, "ri")) return("reverse italic"); else if (!g_strcasecmp(slant, "ri")) return(_("reverse italic"));
else if (!g_strcasecmp(slant, "ro")) return("reverse oblique"); else if (!g_strcasecmp(slant, "ro")) return(_("reverse oblique"));
else if (!g_strcasecmp(slant, "ot")) return("other"); else if (!g_strcasecmp(slant, "ot")) return(_("other"));
return slant; return slant;
} }
static gchar* static gchar*
gtk_font_selection_expand_spacing_code(gchar *spacing) gtk_font_selection_expand_spacing_code(gchar *spacing)
{ {
if (!g_strcasecmp(spacing, "p")) return("proportional"); if (!g_strcasecmp(spacing, "p")) return(_("proportional"));
else if (!g_strcasecmp(spacing, "m")) return("monospaced"); else if (!g_strcasecmp(spacing, "m")) return(_("monospaced"));
else if (!g_strcasecmp(spacing, "c")) return("char cell"); else if (!g_strcasecmp(spacing, "c")) return(_("char cell"));
return spacing; return spacing;
} }
@ -2135,12 +2136,12 @@ gtk_font_selection_update_filter (GtkFontSelection *fontsel)
if (default_filter) if (default_filter)
{ {
gtk_widget_set_sensitive(fontsel->filter_button, FALSE); gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font:"); gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font:"));
} }
else else
{ {
gtk_widget_set_sensitive(fontsel->filter_button, TRUE); gtk_widget_set_sensitive(fontsel->filter_button, TRUE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font: (Filter Applied)"); gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font: (Filter Applied)"));
} }
gtk_font_selection_show_available_fonts(fontsel); gtk_font_selection_show_available_fonts(fontsel);
} }
@ -2365,7 +2366,7 @@ gtk_font_selection_clear_filter (GtkFontSelection *fontsel)
/* Update the main notebook page. */ /* Update the main notebook page. */
gtk_widget_set_sensitive(fontsel->filter_button, FALSE); gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font:"); gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font:"));
gtk_font_selection_show_available_fonts(fontsel); gtk_font_selection_show_available_fonts(fontsel);
} }
@ -2616,7 +2617,7 @@ gtk_font_selection_get_fonts (void)
xfontnames = XListFonts (GDK_DISPLAY(), "-*", MAX_FONTS, &num_fonts); xfontnames = XListFonts (GDK_DISPLAY(), "-*", MAX_FONTS, &num_fonts);
/* Output a warning if we actually get MAX_FONTS fonts. */ /* Output a warning if we actually get MAX_FONTS fonts. */
if (num_fonts == MAX_FONTS) if (num_fonts == MAX_FONTS)
g_warning("MAX_FONTS exceeded. Some fonts may be missing."); g_warning(_("MAX_FONTS exceeded. Some fonts may be missing."));
/* The maximum size of all these tables is the number of font names /* The maximum size of all these tables is the number of font names
returned. We realloc them later when we know exactly how many returned. We realloc them later when we know exactly how many
@ -3454,20 +3455,20 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
fontseldiag->action_area, FALSE, FALSE, 0); fontseldiag->action_area, FALSE, FALSE, 0);
gtk_widget_show (fontseldiag->action_area); gtk_widget_show (fontseldiag->action_area);
fontseldiag->ok_button = gtk_button_new_with_label("OK"); fontseldiag->ok_button = gtk_button_new_with_label(_("OK"));
GTK_WIDGET_SET_FLAGS (fontseldiag->ok_button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (fontseldiag->ok_button, GTK_CAN_DEFAULT);
gtk_widget_show(fontseldiag->ok_button); gtk_widget_show(fontseldiag->ok_button);
gtk_box_pack_start (GTK_BOX (fontseldiag->action_area), gtk_box_pack_start (GTK_BOX (fontseldiag->action_area),
fontseldiag->ok_button, TRUE, TRUE, 0); fontseldiag->ok_button, TRUE, TRUE, 0);
gtk_widget_grab_default (fontseldiag->ok_button); gtk_widget_grab_default (fontseldiag->ok_button);
fontseldiag->apply_button = gtk_button_new_with_label("Apply"); fontseldiag->apply_button = gtk_button_new_with_label(_("Apply"));
GTK_WIDGET_SET_FLAGS (fontseldiag->apply_button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (fontseldiag->apply_button, GTK_CAN_DEFAULT);
/*gtk_widget_show(fontseldiag->apply_button);*/ /*gtk_widget_show(fontseldiag->apply_button);*/
gtk_box_pack_start (GTK_BOX(fontseldiag->action_area), gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
fontseldiag->apply_button, TRUE, TRUE, 0); fontseldiag->apply_button, TRUE, TRUE, 0);
fontseldiag->cancel_button = gtk_button_new_with_label("Cancel"); fontseldiag->cancel_button = gtk_button_new_with_label(_("Cancel"));
GTK_WIDGET_SET_FLAGS (fontseldiag->cancel_button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (fontseldiag->cancel_button, GTK_CAN_DEFAULT);
gtk_widget_show(fontseldiag->cancel_button); gtk_widget_show(fontseldiag->cancel_button);
gtk_box_pack_start (GTK_BOX(fontseldiag->action_area), gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
@ -3483,7 +3484,7 @@ gtk_font_selection_dialog_new (const gchar *title)
fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG); fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG);
gtk_window_set_title (GTK_WINDOW (fontseldiag), gtk_window_set_title (GTK_WINDOW (fontseldiag),
title ? title : "Font Selection"); title ? title : _("Font Selection"));
return GTK_WIDGET (fontseldiag); return GTK_WIDGET (fontseldiag);
} }

9
gtk/gtkgamma.c
View File

@ -34,6 +34,7 @@
#include "gtktable.h" #include "gtktable.h"
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h"
static GtkVBoxClass *parent_class = NULL; static GtkVBoxClass *parent_class = NULL;
@ -384,14 +385,14 @@ button_clicked_callback (GtkWidget *w, gpointer data)
gchar buf[64]; gchar buf[64];
c->gamma_dialog = gtk_dialog_new (); c->gamma_dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), "Gamma"); gtk_window_set_title (GTK_WINDOW (c->gamma_dialog), _("Gamma"));
vbox = GTK_DIALOG (c->gamma_dialog)->vbox; vbox = GTK_DIALOG (c->gamma_dialog)->vbox;
hbox = gtk_hbox_new (/* homogeneous */ FALSE, 0); hbox = gtk_hbox_new (/* homogeneous */ FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);
gtk_widget_show (hbox); gtk_widget_show (hbox);
label = gtk_label_new ("Gamma value"); label = gtk_label_new (_("Gamma value"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
gtk_widget_show (label); gtk_widget_show (label);
@ -404,7 +405,7 @@ button_clicked_callback (GtkWidget *w, gpointer data)
/* fill in action area: */ /* fill in action area: */
hbox = GTK_DIALOG (c->gamma_dialog)->action_area; hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
button = gtk_button_new_with_label ("OK"); button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gamma_ok_callback, c); (GtkSignalFunc) gamma_ok_callback, c);
@ -412,7 +413,7 @@ button_clicked_callback (GtkWidget *w, gpointer data)
gtk_widget_grab_default (button); gtk_widget_grab_default (button);
gtk_widget_show (button); gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel"); button = gtk_button_new_with_label (_("Cancel"));
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gamma_cancel_callback, c); (GtkSignalFunc) gamma_cancel_callback, c);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

5
gtk/gtknotebook.c
View File

@ -24,6 +24,7 @@
#include "gtklabel.h" #include "gtklabel.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <stdio.h> #include <stdio.h>
#include "gtkintl.h"
#define TAB_OVERLAP 2 #define TAB_OVERLAP 2
@ -1942,7 +1943,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
list = gtk_notebook_search_page (notebook, list, STEP_NEXT, FALSE)) list = gtk_notebook_search_page (notebook, list, STEP_NEXT, FALSE))
{ {
page = list->data; page = list->data;
sprintf (string, "Page %u", page_num++); sprintf (string, _("Page %u"), page_num++);
if (notebook->show_tabs) if (notebook->show_tabs)
{ {
if (page->default_tab) if (page->default_tab)
@ -3962,7 +3963,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
{ {
gchar string[32]; gchar string[32];
sprintf (string, "Page %u", sprintf (string, _("Page %u"),
gtk_notebook_real_page_position (notebook, list)); gtk_notebook_real_page_position (notebook, list));
page->tab_label = gtk_label_new (string); page->tab_label = gtk_label_new (string);
gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook)); gtk_widget_set_parent (page->tab_label, GTK_WIDGET (notebook));

5
gtk/gtkrc.c
View File

@ -29,6 +29,7 @@
#include "gtkrc.h" #include "gtkrc.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkthemes.h" #include "gtkthemes.h"
#include "gtkintl.h"
typedef struct _GtkRcSet GtkRcSet; typedef struct _GtkRcSet GtkRcSet;
typedef struct _GtkRcNode GtkRcNode; typedef struct _GtkRcNode GtkRcNode;
@ -1529,10 +1530,10 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner,
} }
if (scanner) if (scanner)
g_warning ("Unable to locate image file in pixmap_path: \"%s\" line %d", g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
pixmap_file, scanner->line); pixmap_file, scanner->line);
else else
g_warning ("Unable to locate image file in pixmap_path: \"%s\"", g_warning (_("Unable to locate image file in pixmap_path: \"%s\""),
pixmap_file); pixmap_file);
return NULL; return NULL;

7
gtk/gtkthemes.c
View File

@ -27,6 +27,7 @@
#include "gtksignal.h" #include "gtksignal.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "config.h" #include "config.h"
#include "gtkintl.h"
typedef struct _GtkThemeEnginePrivate GtkThemeEnginePrivate; typedef struct _GtkThemeEnginePrivate GtkThemeEnginePrivate;
@ -67,15 +68,15 @@ gtk_theme_engine_get (gchar *name)
if (!engine_path) if (!engine_path)
{ {
g_warning ("Unable to locate loadable module in module_path: \"%s\",", g_warning (_("Unable to locate loadable module in module_path: \"%s\","),
fullname); fullname);
return NULL; return NULL;
} }
/* load the lib */ /* load the lib */
printf ("Loading Theme %s\n", engine_path); GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
library = g_module_open (engine_path, 0); library = g_module_open (engine_path, 0);
g_free(engine_path); g_free(engine_path);

3
gtk/gtktipsquery.c
View File

@ -23,6 +23,7 @@
#include "gtksignal.h" #include "gtksignal.h"
#include "gtktooltips.h" #include "gtktooltips.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h"
@ -168,7 +169,7 @@ gtk_tips_query_init (GtkTipsQuery *tips_query)
tips_query->emit_always = FALSE; tips_query->emit_always = FALSE;
tips_query->in_query = FALSE; tips_query->in_query = FALSE;
tips_query->label_inactive = g_strdup (""); tips_query->label_inactive = g_strdup ("");
tips_query->label_no_tip = g_strdup ("--- No Tip ---"); tips_query->label_no_tip = g_strdup (_("--- No Tip ---"));
tips_query->caller = NULL; tips_query->caller = NULL;
tips_query->last_crossed = NULL; tips_query->last_crossed = NULL;
tips_query->query_cursor = NULL; tips_query->query_cursor = NULL;

9
po/POTFILES.in
View File

@ -1,5 +1,12 @@
# Files from the Gtk ditribution which have already been # Files from the Gtk ditribution which have already been
# marked to allow runtime translation of messages # marked to allow runtime translation of messages
gtk/gtkcolorsel.c
gtk/gtkfilesel.c gtk/gtkfilesel.c
gtk/gtkcolorsel.c gtk/gtkfontsel.c
gtk/gtkgamma.c
gtk/gtkinputdialog.c
gtk/gtknotebook.c
gtk/gtkrc.c
gtk/gtkthemes.c
gtk/gtktipsquery.c

89
po/nl.po Normal file
View File

@ -0,0 +1,89 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <pauls@euronet.nl>, 1998.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 1998-12-18 01:13+0100\n"
"PO-Revision-Date: 1998-12-18 01:13+0100\n"
"Last-Translator: Paul Siegmann <pauls@euronet.nl>\n"
"Language-Team: LANGUAGE <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
#: gtk/gtkfilesel.c:419
msgid "Directories"
msgstr "Directories"
#. The files clist
#: gtk/gtkfilesel.c:430
msgid "Files"
msgstr "Bestanden"
#. The OK button
#: gtk/gtkfilesel.c:462
msgid "OK"
msgstr "OK"
#. The Cancel button
#: gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844 gtk/gtkfilesel.c:944
#: gtk/gtkfilesel.c:1059
msgid "Cancel"
msgstr "Annuleren"
#: gtk/gtkfilesel.c:500 gtk/gtkfilesel.c:1455
#, c-format
msgid "Directory unreadable: %s"
msgstr "Directory onleesbaar: %s"
#: gtk/gtkfilesel.c:532
msgid "Create Dir"
msgstr "Maak Dir"
#: gtk/gtkfilesel.c:543 gtk/gtkfilesel.c:913
msgid "Delete File"
msgstr "Verwijder Bestand"
#: gtk/gtkfilesel.c:554 gtk/gtkfilesel.c:1017
msgid "Rename File"
msgstr "Wijzig Bestandsnaam"
#.
#. gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
#. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
#. (gpointer) fs);
#.
#: gtk/gtkfilesel.c:715
msgid "Error"
msgstr "Fout"
#. close button
#: gtk/gtkfilesel.c:733
msgid "Close"
msgstr "Sluiten"
#: gtk/gtkfilesel.c:808
msgid "Create Directory"
msgstr "Maak Directory"
#: gtk/gtkfilesel.c:822
msgid "Directory name:"
msgstr "Directory naam:"
#. buttons
#: gtk/gtkfilesel.c:835
msgid "Create"
msgstr "Maak"
#. buttons
#: gtk/gtkfilesel.c:935
msgid "Delete"
msgstr "Verwijder"
#. buttons
#: gtk/gtkfilesel.c:1050
msgid "Rename"
msgstr "Hernoem"