From 6a6bc56c8460a04b2c598bd2d8263f3ff8e20384 Mon Sep 17 00:00:00 2001 From: Tomas Ogren Date: Mon, 7 Jun 1999 02:21:31 +0000 Subject: [PATCH] app/bucket_fill.c app/color_picker.c app/commands.c app/convolve.c 1999-06-07 Tomas Ogren * app/bucket_fill.c app/color_picker.c app/commands.c app/convolve.c * app/crop.c app/flip_tool.c app/gimpunit.c app/global_edit.c * app/gradient.c app/histogram_tool.c app/magnify.c app/module_db.c * app/palette.c app/paths_dialog.c app/text_tool.c app/transform_tool.c Misc i18n fixes, partly ported from Egger-gimp --- ChangeLog | 8 ++++++++ app/actions/help-commands.c | 12 ++++++++---- app/bucket_fill.c | 2 +- app/color_picker.c | 2 +- app/commands.c | 12 ++++++++---- app/convolve.c | 2 +- app/core/gimp-edit.c | 8 ++++---- app/core/gimpedit.c | 8 ++++---- app/core/gimpunit.c | 4 ++-- app/crop.c | 4 ++-- app/dialogs/module-dialog.c | 2 +- app/flip_tool.c | 4 ++-- app/gimpunit.c | 4 ++-- app/global_edit.c | 8 ++++---- app/gradient.c | 14 +++++++------- app/gradient_editor.c | 14 +++++++------- app/gui/commands.c | 12 ++++++++---- app/gui/gradient-editor.c | 14 +++++++------- app/gui/help-commands.c | 12 ++++++++---- app/gui/module-browser.c | 2 +- app/gui/palette-editor.c | 8 ++++---- app/gui/paths-dialog.c | 4 ++-- app/histogram_tool.c | 17 +++++++++-------- app/magnify.c | 2 +- app/module_db.c | 2 +- app/paint/gimpconvolve.c | 2 +- app/palette.c | 8 ++++---- app/paths_dialog.c | 4 ++-- app/text_tool.c | 2 +- app/tools/bucket_fill.c | 2 +- app/tools/color_picker.c | 2 +- app/tools/convolve.c | 2 +- app/tools/crop.c | 4 ++-- app/tools/flip_tool.c | 4 ++-- app/tools/gimpbucketfilltool.c | 2 +- app/tools/gimpconvolvetool.c | 2 +- app/tools/gimpcroptool.c | 4 ++-- app/tools/gimpfliptool.c | 4 ++-- app/tools/gimphistogramtool.c | 17 +++++++++-------- app/tools/gimpmagnifytool.c | 2 +- app/tools/gimptexttool.c | 2 +- app/tools/histogram_tool.c | 17 +++++++++-------- app/tools/magnify.c | 2 +- app/tools/text_tool.c | 2 +- app/tools/transform_tool.c | 2 +- app/transform_tool.c | 2 +- app/widgets/gimpgradienteditor.c | 14 +++++++------- app/widgets/gimppaletteeditor.c | 8 ++++---- 48 files changed, 159 insertions(+), 132 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e1c630763..63dda1d870 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-06-07 Tomas Ogren + + * app/bucket_fill.c app/color_picker.c app/commands.c app/convolve.c + * app/crop.c app/flip_tool.c app/gimpunit.c app/global_edit.c + * app/gradient.c app/histogram_tool.c app/magnify.c app/module_db.c + * app/palette.c app/paths_dialog.c app/text_tool.c app/transform_tool.c + Misc i18n fixes, partly ported from Egger-gimp + 1999-06-06 Tomas Ogren * app/menus.[ch]: locale-wrapper for menus_set_sensitive (..._locale) diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c index 174a1a12a2..7b258a42c8 100644 --- a/app/actions/help-commands.c +++ b/app/actions/help-commands.c @@ -361,7 +361,8 @@ select_border_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Border Selection"), _("Border selection by:"), + query_size_box (N_("Border Selection"), + N_("Border selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -379,7 +380,8 @@ select_feather_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Feather Selection"), _("Feather selection by:"), + query_size_box (N_("Feather Selection"), + N_("Feather selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -397,7 +399,8 @@ select_grow_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Grow Selection"), _("Grow selection by:"), + query_size_box (N_("Grow Selection"), + N_("Grow selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -415,7 +418,8 @@ select_shrink_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Shrink Selection"), _("Shrink selection by:"), + query_size_box (N_("Shrink Selection"), + N_("Shrink selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, diff --git a/app/bucket_fill.c b/app/bucket_fill.c index 448865aa2a..9706362ddb 100644 --- a/app/bucket_fill.c +++ b/app/bucket_fill.c @@ -162,7 +162,7 @@ bucket_options_new (void) gtk_widget_show (options->sample_merged_w); /* fill type */ - frame = tool_options_radio_buttons_new (_("Fill Type"), + frame = tool_options_radio_buttons_new (N_("Fill Type"), &options->fill_mode, options->fill_mode_w, fill_mode_label, diff --git a/app/color_picker.c b/app/color_picker.c index dc05e86c2d..5aba6f35df 100644 --- a/app/color_picker.c +++ b/app/color_picker.c @@ -124,7 +124,7 @@ color_picker_options_new (void) /* the new color picker tool options structure */ options = (ColorPickerOptions *) g_malloc (sizeof (ColorPickerOptions)); tool_options_init ((ToolOptions *) options, - _("Color Picker Options"), + N_("Color Picker Options"), color_picker_options_reset); options->sample_merged = options->sample_merged_d = FALSE; options->sample_average = options->sample_average_d = FALSE; diff --git a/app/commands.c b/app/commands.c index 174a1a12a2..7b258a42c8 100644 --- a/app/commands.c +++ b/app/commands.c @@ -361,7 +361,8 @@ select_border_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Border Selection"), _("Border selection by:"), + query_size_box (N_("Border Selection"), + N_("Border selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -379,7 +380,8 @@ select_feather_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Feather Selection"), _("Feather selection by:"), + query_size_box (N_("Feather Selection"), + N_("Feather selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -397,7 +399,8 @@ select_grow_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Grow Selection"), _("Grow selection by:"), + query_size_box (N_("Grow Selection"), + N_("Grow selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -415,7 +418,8 @@ select_shrink_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Shrink Selection"), _("Shrink selection by:"), + query_size_box (N_("Shrink Selection"), + N_("Shrink selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, diff --git a/app/convolve.c b/app/convolve.c index 4ec1150f5f..ae312e505f 100644 --- a/app/convolve.c +++ b/app/convolve.c @@ -161,7 +161,7 @@ convolve_options_new (void) gtk_widget_show (scale); gtk_widget_show (hbox); - frame = tool_options_radio_buttons_new (_("Convolve Type"), + frame = tool_options_radio_buttons_new (N_("Convolve Type"), &options->type, options->type_w, type_label, diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c index 6c0441bb85..4f4e547a00 100644 --- a/app/core/gimp-edit.c +++ b/app/core/gimp-edit.c @@ -696,8 +696,8 @@ named_edit_cut (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; active_tool_control (HALT, gdisp_ptr); - query_string_box (_("Cut Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Cut Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", cut_named_buffer_callback, gdisp); @@ -728,8 +728,8 @@ named_edit_copy (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; - query_string_box (_("Copy Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Copy Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", copy_named_buffer_callback, gdisp); diff --git a/app/core/gimpedit.c b/app/core/gimpedit.c index 6c0441bb85..4f4e547a00 100644 --- a/app/core/gimpedit.c +++ b/app/core/gimpedit.c @@ -696,8 +696,8 @@ named_edit_cut (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; active_tool_control (HALT, gdisp_ptr); - query_string_box (_("Cut Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Cut Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", cut_named_buffer_callback, gdisp); @@ -728,8 +728,8 @@ named_edit_copy (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; - query_string_box (_("Copy Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Copy Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", copy_named_buffer_callback, gdisp); diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c index 317c45e620..f79675db45 100644 --- a/app/core/gimpunit.c +++ b/app/core/gimpunit.c @@ -248,7 +248,7 @@ gimp_unit_get_singular (GUnit unit) if (unit == UNIT_PERCENT) return gettext (gimp_unit_percent.singular); - return gimp_unit_get_user_unit (unit)->singular; + return gettext (gimp_unit_get_user_unit (unit)->singular); } @@ -266,7 +266,7 @@ gimp_unit_get_plural (GUnit unit) if (unit == UNIT_PERCENT) return gettext (gimp_unit_percent.plural); - return gimp_unit_get_user_unit (unit)->plural; + return gettext (gimp_unit_get_user_unit (unit)->plural); } diff --git a/app/crop.c b/app/crop.c index 7daa8c323f..0c62eccc12 100644 --- a/app/crop.c +++ b/app/crop.c @@ -172,7 +172,7 @@ crop_options_new (void) /* the new crop tool options structure */ options = (CropOptions *) g_malloc (sizeof (CropOptions)); tool_options_init ((ToolOptions *) options, - _("Crop & Resize Options"), + N_("Crop & Resize Options"), crop_options_reset); options->layer_only = options->layer_only_d = FALSE; options->allow_enlarge = options->allow_enlarge_d = TRUE; @@ -205,7 +205,7 @@ crop_options_new (void) gtk_widget_show (options->allow_enlarge_w); /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index 8e3006a3f1..edddfe2717 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -38,10 +38,10 @@ #include "datafiles.h" #include "actionarea.h" #include "gimpset.h" -#include "libgimp/gimpintl.h" #include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" +#include "libgimp/gimpintl.h" /* export this to gimprc.c */ char *module_db_load_inhibit = NULL; diff --git a/app/flip_tool.c b/app/flip_tool.c index a13d5a34cf..8647ac5d84 100644 --- a/app/flip_tool.c +++ b/app/flip_tool.c @@ -73,7 +73,7 @@ flip_options_new (void) /* the new flip tool options structure */ options = (FlipOptions *) g_malloc (sizeof (FlipOptions)); tool_options_init ((ToolOptions *) options, - _("Flip Tool Options"), + N_("Flip Tool Options"), flip_options_reset); options->type = options->type_d = FLIP_HORZ; @@ -81,7 +81,7 @@ flip_options_new (void) vbox = options->tool_options.main_vbox; /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/gimpunit.c b/app/gimpunit.c index 317c45e620..f79675db45 100644 --- a/app/gimpunit.c +++ b/app/gimpunit.c @@ -248,7 +248,7 @@ gimp_unit_get_singular (GUnit unit) if (unit == UNIT_PERCENT) return gettext (gimp_unit_percent.singular); - return gimp_unit_get_user_unit (unit)->singular; + return gettext (gimp_unit_get_user_unit (unit)->singular); } @@ -266,7 +266,7 @@ gimp_unit_get_plural (GUnit unit) if (unit == UNIT_PERCENT) return gettext (gimp_unit_percent.plural); - return gimp_unit_get_user_unit (unit)->plural; + return gettext (gimp_unit_get_user_unit (unit)->plural); } diff --git a/app/global_edit.c b/app/global_edit.c index 6c0441bb85..4f4e547a00 100644 --- a/app/global_edit.c +++ b/app/global_edit.c @@ -696,8 +696,8 @@ named_edit_cut (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; active_tool_control (HALT, gdisp_ptr); - query_string_box (_("Cut Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Cut Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", cut_named_buffer_callback, gdisp); @@ -728,8 +728,8 @@ named_edit_copy (void *gdisp_ptr) gdisp = (GDisplay *) gdisp_ptr; - query_string_box (_("Copy Named"), - _("Enter a name for this buffer"), + query_string_box (N_("Copy Named"), + N_("Enter a name for this buffer"), NULL, GTK_OBJECT (gdisp->gimage), "destroy", copy_named_buffer_callback, gdisp); diff --git a/app/gradient.c b/app/gradient.c index 300375f881..2fa4107e63 100644 --- a/app/gradient.c +++ b/app/gradient.c @@ -1248,9 +1248,9 @@ ed_close_callback(GtkWidget *widget, gpointer client_data) static void ed_new_gradient_callback(GtkWidget *widget, gpointer client_data) { - query_string_box(_("New gradient"), - _("Enter a name for the new gradient"), - _("untitled"), + query_string_box(N_("New gradient"), + N_("Enter a name for the new gradient"), + N_("untitled"), NULL, NULL, ed_do_new_gradient_callback, NULL); } /* ed_new_gradient_callback */ @@ -1358,8 +1358,8 @@ ed_copy_gradient_callback(GtkWidget *widget, gpointer client_data) name = g_strdup_printf(_("%s copy"), curr_gradient->name); - query_string_box(_("Copy gradient"), - _("Enter a name for the copied gradient"), + query_string_box(N_("Copy gradient"), + N_("Enter a name for the copied gradient"), name, NULL, NULL, ed_do_copy_gradient_callback, NULL); @@ -1588,8 +1588,8 @@ ed_rename_grads_callback(GtkWidget *widget, gpointer client_data) if(curr_gradient == NULL) return; - query_string_box(_("Rename gradient"), - _("Enter a new name for the gradient"), + query_string_box(N_("Rename gradient"), + N_("Enter a new name for the gradient"), curr_gradient->name, NULL, NULL, ed_do_rename_gradient_callback, curr_gradient); diff --git a/app/gradient_editor.c b/app/gradient_editor.c index 300375f881..2fa4107e63 100644 --- a/app/gradient_editor.c +++ b/app/gradient_editor.c @@ -1248,9 +1248,9 @@ ed_close_callback(GtkWidget *widget, gpointer client_data) static void ed_new_gradient_callback(GtkWidget *widget, gpointer client_data) { - query_string_box(_("New gradient"), - _("Enter a name for the new gradient"), - _("untitled"), + query_string_box(N_("New gradient"), + N_("Enter a name for the new gradient"), + N_("untitled"), NULL, NULL, ed_do_new_gradient_callback, NULL); } /* ed_new_gradient_callback */ @@ -1358,8 +1358,8 @@ ed_copy_gradient_callback(GtkWidget *widget, gpointer client_data) name = g_strdup_printf(_("%s copy"), curr_gradient->name); - query_string_box(_("Copy gradient"), - _("Enter a name for the copied gradient"), + query_string_box(N_("Copy gradient"), + N_("Enter a name for the copied gradient"), name, NULL, NULL, ed_do_copy_gradient_callback, NULL); @@ -1588,8 +1588,8 @@ ed_rename_grads_callback(GtkWidget *widget, gpointer client_data) if(curr_gradient == NULL) return; - query_string_box(_("Rename gradient"), - _("Enter a new name for the gradient"), + query_string_box(N_("Rename gradient"), + N_("Enter a new name for the gradient"), curr_gradient->name, NULL, NULL, ed_do_rename_gradient_callback, curr_gradient); diff --git a/app/gui/commands.c b/app/gui/commands.c index 174a1a12a2..7b258a42c8 100644 --- a/app/gui/commands.c +++ b/app/gui/commands.c @@ -361,7 +361,8 @@ select_border_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Border Selection"), _("Border selection by:"), + query_size_box (N_("Border Selection"), + N_("Border selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -379,7 +380,8 @@ select_feather_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Feather Selection"), _("Feather selection by:"), + query_size_box (N_("Feather Selection"), + N_("Feather selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -397,7 +399,8 @@ select_grow_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Grow Selection"), _("Grow selection by:"), + query_size_box (N_("Grow Selection"), + N_("Grow selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -415,7 +418,8 @@ select_shrink_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Shrink Selection"), _("Shrink selection by:"), + query_size_box (N_("Shrink Selection"), + N_("Shrink selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index 300375f881..2fa4107e63 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -1248,9 +1248,9 @@ ed_close_callback(GtkWidget *widget, gpointer client_data) static void ed_new_gradient_callback(GtkWidget *widget, gpointer client_data) { - query_string_box(_("New gradient"), - _("Enter a name for the new gradient"), - _("untitled"), + query_string_box(N_("New gradient"), + N_("Enter a name for the new gradient"), + N_("untitled"), NULL, NULL, ed_do_new_gradient_callback, NULL); } /* ed_new_gradient_callback */ @@ -1358,8 +1358,8 @@ ed_copy_gradient_callback(GtkWidget *widget, gpointer client_data) name = g_strdup_printf(_("%s copy"), curr_gradient->name); - query_string_box(_("Copy gradient"), - _("Enter a name for the copied gradient"), + query_string_box(N_("Copy gradient"), + N_("Enter a name for the copied gradient"), name, NULL, NULL, ed_do_copy_gradient_callback, NULL); @@ -1588,8 +1588,8 @@ ed_rename_grads_callback(GtkWidget *widget, gpointer client_data) if(curr_gradient == NULL) return; - query_string_box(_("Rename gradient"), - _("Enter a new name for the gradient"), + query_string_box(N_("Rename gradient"), + N_("Enter a new name for the gradient"), curr_gradient->name, NULL, NULL, ed_do_rename_gradient_callback, curr_gradient); diff --git a/app/gui/help-commands.c b/app/gui/help-commands.c index 174a1a12a2..7b258a42c8 100644 --- a/app/gui/help-commands.c +++ b/app/gui/help-commands.c @@ -361,7 +361,8 @@ select_border_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Border Selection"), _("Border selection by:"), + query_size_box (N_("Border Selection"), + N_("Border selection by:"), selection_border_radius, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -379,7 +380,8 @@ select_feather_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Feather Selection"), _("Feather selection by:"), + query_size_box (N_("Feather Selection"), + N_("Feather selection by:"), selection_feather_radius, 0, 32767, 3, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -397,7 +399,8 @@ select_grow_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Grow Selection"), _("Grow selection by:"), + query_size_box (N_("Grow Selection"), + N_("Grow selection by:"), selection_grow_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, @@ -415,7 +418,8 @@ select_shrink_cmd_callback (GtkWidget *widget, gdisp = gdisplay_active (); - query_size_box (_("Shrink Selection"), _("Shrink selection by:"), + query_size_box (N_("Shrink Selection"), + N_("Shrink selection by:"), selection_shrink_pixels, 1, 32767, 0, gdisp->gimage->unit, MIN (gdisp->gimage->xresolution, diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index 8e3006a3f1..edddfe2717 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -38,10 +38,10 @@ #include "datafiles.h" #include "actionarea.h" #include "gimpset.h" -#include "libgimp/gimpintl.h" #include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" +#include "libgimp/gimpintl.h" /* export this to gimprc.c */ char *module_db_load_inhibit = NULL; diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 68785c5309..79f0d09c1d 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -1050,8 +1050,8 @@ static void palette_new_entries_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("New Palette"), - _("Enter a name for new palette"), + query_string_box (N_("New Palette"), + N_("Enter a name for new palette"), NULL, NULL, NULL, palette_add_entries_callback, client_data); @@ -2416,8 +2416,8 @@ static void palette_merge_dialog_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("Merge Palette"), - _("Enter a name for merged palette"), + query_string_box (N_("Merge Palette"), + N_("Enter a name for merged palette"), NULL, NULL, NULL, palette_merge_entries_callback, client_data); diff --git a/app/gui/paths-dialog.c b/app/gui/paths-dialog.c index 14b87bcec5..60fa4a4041 100644 --- a/app/gui/paths-dialog.c +++ b/app/gui/paths-dialog.c @@ -1167,8 +1167,8 @@ paths_dialog_edit_path_query(GtkWidget *widget) NULL, &mask); - query_string_box(_("Rename path"), - _("Enter a new name for the path"), + query_string_box(N_("Rename path"), + N_("Enter a new name for the path"), text, NULL, NULL, do_rename_paths_callback, widget); diff --git a/app/histogram_tool.c b/app/histogram_tool.c index 3fc3177f60..caf10e4afa 100644 --- a/app/histogram_tool.c +++ b/app/histogram_tool.c @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include #include #include @@ -248,7 +249,7 @@ histogram_tool_initialize (GDisplay *gdisp) PixelRegion PR; if (drawable_indexed (gimage_active_drawable (gdisp->gimage))) { - g_message ("Histogram does not operate on indexed drawables."); + g_message (_("Histogram does not operate on indexed drawables.")); return; } @@ -300,7 +301,7 @@ histogram_tool_new_dialog () static ActionAreaItem action_items[] = { - { "Close", histogram_tool_close_callback, NULL, NULL } + { N_("Close"), histogram_tool_close_callback, NULL, NULL } }; static char * histogram_info_names[7] = { @@ -314,10 +315,10 @@ histogram_tool_new_dialog () }; static MenuItem color_option_items[] = { - { "Value", 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, - { "Red", 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, - { "Green", 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, - { "Blue", 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, + { N_("Value"), 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, + { N_("Red"), 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, + { N_("Green"), 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, + { N_("Blue"), 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, { NULL, 0, 0, NULL, NULL, NULL, NULL } }; @@ -332,7 +333,7 @@ histogram_tool_new_dialog () /* The shell and main vbox */ htd->shell = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (htd->shell), "histogram", "Gimp"); - gtk_window_set_title (GTK_WINDOW (htd->shell), "Histogram"); + gtk_window_set_title (GTK_WINDOW (htd->shell), _("Histogram")); /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (htd->shell), "delete_event", @@ -351,7 +352,7 @@ histogram_tool_new_dialog () htd->channel_menu = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), htd->channel_menu, FALSE, FALSE, 0); - label = gtk_label_new ("Information on Channel:"); + label = gtk_label_new (_("Information on Channel:")); gtk_box_pack_start (GTK_BOX (htd->channel_menu), label, FALSE, FALSE, 0); menu = build_menu (color_option_items, NULL); diff --git a/app/magnify.c b/app/magnify.c index 52658ea613..8d8d37906e 100644 --- a/app/magnify.c +++ b/app/magnify.c @@ -92,7 +92,7 @@ magnify_options_new (void) /* the new magnify tool options structure */ options = (MagnifyOptions *) g_malloc (sizeof (MagnifyOptions)); tool_options_init ((ToolOptions *) options, - _("Magnify Options"), + N_("Magnify Options"), magnify_options_reset); options->allow_resize_d = allow_resize_windows; diff --git a/app/module_db.c b/app/module_db.c index 8e3006a3f1..edddfe2717 100644 --- a/app/module_db.c +++ b/app/module_db.c @@ -38,10 +38,10 @@ #include "datafiles.h" #include "actionarea.h" #include "gimpset.h" -#include "libgimp/gimpintl.h" #include "libgimp/gimpenv.h" #include "libgimp/gimpmodule.h" +#include "libgimp/gimpintl.h" /* export this to gimprc.c */ char *module_db_load_inhibit = NULL; diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c index 4ec1150f5f..ae312e505f 100644 --- a/app/paint/gimpconvolve.c +++ b/app/paint/gimpconvolve.c @@ -161,7 +161,7 @@ convolve_options_new (void) gtk_widget_show (scale); gtk_widget_show (hbox); - frame = tool_options_radio_buttons_new (_("Convolve Type"), + frame = tool_options_radio_buttons_new (N_("Convolve Type"), &options->type, options->type_w, type_label, diff --git a/app/palette.c b/app/palette.c index 68785c5309..79f0d09c1d 100644 --- a/app/palette.c +++ b/app/palette.c @@ -1050,8 +1050,8 @@ static void palette_new_entries_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("New Palette"), - _("Enter a name for new palette"), + query_string_box (N_("New Palette"), + N_("Enter a name for new palette"), NULL, NULL, NULL, palette_add_entries_callback, client_data); @@ -2416,8 +2416,8 @@ static void palette_merge_dialog_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("Merge Palette"), - _("Enter a name for merged palette"), + query_string_box (N_("Merge Palette"), + N_("Enter a name for merged palette"), NULL, NULL, NULL, palette_merge_entries_callback, client_data); diff --git a/app/paths_dialog.c b/app/paths_dialog.c index 14b87bcec5..60fa4a4041 100644 --- a/app/paths_dialog.c +++ b/app/paths_dialog.c @@ -1167,8 +1167,8 @@ paths_dialog_edit_path_query(GtkWidget *widget) NULL, &mask); - query_string_box(_("Rename path"), - _("Enter a new name for the path"), + query_string_box(N_("Rename path"), + N_("Enter a new name for the path"), text, NULL, NULL, do_rename_paths_callback, widget); diff --git a/app/text_tool.c b/app/text_tool.c index 4b0284a5a8..47783a063d 100644 --- a/app/text_tool.c +++ b/app/text_tool.c @@ -155,7 +155,7 @@ text_options_new (void) /* the new text tool options structure */ options = (TextOptions *) g_malloc (sizeof (TextOptions)); tool_options_init ((ToolOptions *) options, - _("Text Tool Options"), + N_("Text Tool Options"), text_options_reset); options->antialias = options->antialias_d = TRUE; options->border = options->border_d = 0; diff --git a/app/tools/bucket_fill.c b/app/tools/bucket_fill.c index 448865aa2a..9706362ddb 100644 --- a/app/tools/bucket_fill.c +++ b/app/tools/bucket_fill.c @@ -162,7 +162,7 @@ bucket_options_new (void) gtk_widget_show (options->sample_merged_w); /* fill type */ - frame = tool_options_radio_buttons_new (_("Fill Type"), + frame = tool_options_radio_buttons_new (N_("Fill Type"), &options->fill_mode, options->fill_mode_w, fill_mode_label, diff --git a/app/tools/color_picker.c b/app/tools/color_picker.c index dc05e86c2d..5aba6f35df 100644 --- a/app/tools/color_picker.c +++ b/app/tools/color_picker.c @@ -124,7 +124,7 @@ color_picker_options_new (void) /* the new color picker tool options structure */ options = (ColorPickerOptions *) g_malloc (sizeof (ColorPickerOptions)); tool_options_init ((ToolOptions *) options, - _("Color Picker Options"), + N_("Color Picker Options"), color_picker_options_reset); options->sample_merged = options->sample_merged_d = FALSE; options->sample_average = options->sample_average_d = FALSE; diff --git a/app/tools/convolve.c b/app/tools/convolve.c index 4ec1150f5f..ae312e505f 100644 --- a/app/tools/convolve.c +++ b/app/tools/convolve.c @@ -161,7 +161,7 @@ convolve_options_new (void) gtk_widget_show (scale); gtk_widget_show (hbox); - frame = tool_options_radio_buttons_new (_("Convolve Type"), + frame = tool_options_radio_buttons_new (N_("Convolve Type"), &options->type, options->type_w, type_label, diff --git a/app/tools/crop.c b/app/tools/crop.c index 7daa8c323f..0c62eccc12 100644 --- a/app/tools/crop.c +++ b/app/tools/crop.c @@ -172,7 +172,7 @@ crop_options_new (void) /* the new crop tool options structure */ options = (CropOptions *) g_malloc (sizeof (CropOptions)); tool_options_init ((ToolOptions *) options, - _("Crop & Resize Options"), + N_("Crop & Resize Options"), crop_options_reset); options->layer_only = options->layer_only_d = FALSE; options->allow_enlarge = options->allow_enlarge_d = TRUE; @@ -205,7 +205,7 @@ crop_options_new (void) gtk_widget_show (options->allow_enlarge_w); /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/tools/flip_tool.c b/app/tools/flip_tool.c index a13d5a34cf..8647ac5d84 100644 --- a/app/tools/flip_tool.c +++ b/app/tools/flip_tool.c @@ -73,7 +73,7 @@ flip_options_new (void) /* the new flip tool options structure */ options = (FlipOptions *) g_malloc (sizeof (FlipOptions)); tool_options_init ((ToolOptions *) options, - _("Flip Tool Options"), + N_("Flip Tool Options"), flip_options_reset); options->type = options->type_d = FLIP_HORZ; @@ -81,7 +81,7 @@ flip_options_new (void) vbox = options->tool_options.main_vbox; /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index 448865aa2a..9706362ddb 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -162,7 +162,7 @@ bucket_options_new (void) gtk_widget_show (options->sample_merged_w); /* fill type */ - frame = tool_options_radio_buttons_new (_("Fill Type"), + frame = tool_options_radio_buttons_new (N_("Fill Type"), &options->fill_mode, options->fill_mode_w, fill_mode_label, diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c index 4ec1150f5f..ae312e505f 100644 --- a/app/tools/gimpconvolvetool.c +++ b/app/tools/gimpconvolvetool.c @@ -161,7 +161,7 @@ convolve_options_new (void) gtk_widget_show (scale); gtk_widget_show (hbox); - frame = tool_options_radio_buttons_new (_("Convolve Type"), + frame = tool_options_radio_buttons_new (N_("Convolve Type"), &options->type, options->type_w, type_label, diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 7daa8c323f..0c62eccc12 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -172,7 +172,7 @@ crop_options_new (void) /* the new crop tool options structure */ options = (CropOptions *) g_malloc (sizeof (CropOptions)); tool_options_init ((ToolOptions *) options, - _("Crop & Resize Options"), + N_("Crop & Resize Options"), crop_options_reset); options->layer_only = options->layer_only_d = FALSE; options->allow_enlarge = options->allow_enlarge_d = TRUE; @@ -205,7 +205,7 @@ crop_options_new (void) gtk_widget_show (options->allow_enlarge_w); /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index a13d5a34cf..8647ac5d84 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -73,7 +73,7 @@ flip_options_new (void) /* the new flip tool options structure */ options = (FlipOptions *) g_malloc (sizeof (FlipOptions)); tool_options_init ((ToolOptions *) options, - _("Flip Tool Options"), + N_("Flip Tool Options"), flip_options_reset); options->type = options->type_d = FLIP_HORZ; @@ -81,7 +81,7 @@ flip_options_new (void) vbox = options->tool_options.main_vbox; /* tool toggle */ - frame = tool_options_radio_buttons_new (_("Tool Toggle"), + frame = tool_options_radio_buttons_new (N_("Tool Toggle"), &options->type, options->type_w, type_label, diff --git a/app/tools/gimphistogramtool.c b/app/tools/gimphistogramtool.c index 3fc3177f60..caf10e4afa 100644 --- a/app/tools/gimphistogramtool.c +++ b/app/tools/gimphistogramtool.c @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include #include #include @@ -248,7 +249,7 @@ histogram_tool_initialize (GDisplay *gdisp) PixelRegion PR; if (drawable_indexed (gimage_active_drawable (gdisp->gimage))) { - g_message ("Histogram does not operate on indexed drawables."); + g_message (_("Histogram does not operate on indexed drawables.")); return; } @@ -300,7 +301,7 @@ histogram_tool_new_dialog () static ActionAreaItem action_items[] = { - { "Close", histogram_tool_close_callback, NULL, NULL } + { N_("Close"), histogram_tool_close_callback, NULL, NULL } }; static char * histogram_info_names[7] = { @@ -314,10 +315,10 @@ histogram_tool_new_dialog () }; static MenuItem color_option_items[] = { - { "Value", 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, - { "Red", 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, - { "Green", 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, - { "Blue", 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, + { N_("Value"), 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, + { N_("Red"), 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, + { N_("Green"), 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, + { N_("Blue"), 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, { NULL, 0, 0, NULL, NULL, NULL, NULL } }; @@ -332,7 +333,7 @@ histogram_tool_new_dialog () /* The shell and main vbox */ htd->shell = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (htd->shell), "histogram", "Gimp"); - gtk_window_set_title (GTK_WINDOW (htd->shell), "Histogram"); + gtk_window_set_title (GTK_WINDOW (htd->shell), _("Histogram")); /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (htd->shell), "delete_event", @@ -351,7 +352,7 @@ histogram_tool_new_dialog () htd->channel_menu = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), htd->channel_menu, FALSE, FALSE, 0); - label = gtk_label_new ("Information on Channel:"); + label = gtk_label_new (_("Information on Channel:")); gtk_box_pack_start (GTK_BOX (htd->channel_menu), label, FALSE, FALSE, 0); menu = build_menu (color_option_items, NULL); diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c index 52658ea613..8d8d37906e 100644 --- a/app/tools/gimpmagnifytool.c +++ b/app/tools/gimpmagnifytool.c @@ -92,7 +92,7 @@ magnify_options_new (void) /* the new magnify tool options structure */ options = (MagnifyOptions *) g_malloc (sizeof (MagnifyOptions)); tool_options_init ((ToolOptions *) options, - _("Magnify Options"), + N_("Magnify Options"), magnify_options_reset); options->allow_resize_d = allow_resize_windows; diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 4b0284a5a8..47783a063d 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -155,7 +155,7 @@ text_options_new (void) /* the new text tool options structure */ options = (TextOptions *) g_malloc (sizeof (TextOptions)); tool_options_init ((ToolOptions *) options, - _("Text Tool Options"), + N_("Text Tool Options"), text_options_reset); options->antialias = options->antialias_d = TRUE; options->border = options->border_d = 0; diff --git a/app/tools/histogram_tool.c b/app/tools/histogram_tool.c index 3fc3177f60..caf10e4afa 100644 --- a/app/tools/histogram_tool.c +++ b/app/tools/histogram_tool.c @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include #include #include @@ -248,7 +249,7 @@ histogram_tool_initialize (GDisplay *gdisp) PixelRegion PR; if (drawable_indexed (gimage_active_drawable (gdisp->gimage))) { - g_message ("Histogram does not operate on indexed drawables."); + g_message (_("Histogram does not operate on indexed drawables.")); return; } @@ -300,7 +301,7 @@ histogram_tool_new_dialog () static ActionAreaItem action_items[] = { - { "Close", histogram_tool_close_callback, NULL, NULL } + { N_("Close"), histogram_tool_close_callback, NULL, NULL } }; static char * histogram_info_names[7] = { @@ -314,10 +315,10 @@ histogram_tool_new_dialog () }; static MenuItem color_option_items[] = { - { "Value", 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, - { "Red", 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, - { "Green", 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, - { "Blue", 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, + { N_("Value"), 0, 0, histogram_tool_value_callback, NULL, NULL, NULL }, + { N_("Red"), 0, 0, histogram_tool_red_callback, NULL, NULL, NULL }, + { N_("Green"), 0, 0, histogram_tool_green_callback, NULL, NULL, NULL }, + { N_("Blue"), 0, 0, histogram_tool_blue_callback, NULL, NULL, NULL }, { NULL, 0, 0, NULL, NULL, NULL, NULL } }; @@ -332,7 +333,7 @@ histogram_tool_new_dialog () /* The shell and main vbox */ htd->shell = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (htd->shell), "histogram", "Gimp"); - gtk_window_set_title (GTK_WINDOW (htd->shell), "Histogram"); + gtk_window_set_title (GTK_WINDOW (htd->shell), _("Histogram")); /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (htd->shell), "delete_event", @@ -351,7 +352,7 @@ histogram_tool_new_dialog () htd->channel_menu = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox2), htd->channel_menu, FALSE, FALSE, 0); - label = gtk_label_new ("Information on Channel:"); + label = gtk_label_new (_("Information on Channel:")); gtk_box_pack_start (GTK_BOX (htd->channel_menu), label, FALSE, FALSE, 0); menu = build_menu (color_option_items, NULL); diff --git a/app/tools/magnify.c b/app/tools/magnify.c index 52658ea613..8d8d37906e 100644 --- a/app/tools/magnify.c +++ b/app/tools/magnify.c @@ -92,7 +92,7 @@ magnify_options_new (void) /* the new magnify tool options structure */ options = (MagnifyOptions *) g_malloc (sizeof (MagnifyOptions)); tool_options_init ((ToolOptions *) options, - _("Magnify Options"), + N_("Magnify Options"), magnify_options_reset); options->allow_resize_d = allow_resize_windows; diff --git a/app/tools/text_tool.c b/app/tools/text_tool.c index 4b0284a5a8..47783a063d 100644 --- a/app/tools/text_tool.c +++ b/app/tools/text_tool.c @@ -155,7 +155,7 @@ text_options_new (void) /* the new text tool options structure */ options = (TextOptions *) g_malloc (sizeof (TextOptions)); tool_options_init ((ToolOptions *) options, - _("Text Tool Options"), + N_("Text Tool Options"), text_options_reset); options->antialias = options->antialias_d = TRUE; options->border = options->border_d = 0; diff --git a/app/tools/transform_tool.c b/app/tools/transform_tool.c index 8d7f9e08ed..e9a8e95041 100644 --- a/app/tools/transform_tool.c +++ b/app/tools/transform_tool.c @@ -201,7 +201,7 @@ transform_options_new (void) /* the new transform tool options structure */ options = (TransformOptions *) g_malloc (sizeof (TransformOptions)); tool_options_init ((ToolOptions *) options, - _("Transform Tool Options"), + N_("Transform Tool Options"), transform_options_reset); options->type = options->type_d = ROTATE; options->smoothing = options->smoothing_d = TRUE; diff --git a/app/transform_tool.c b/app/transform_tool.c index 8d7f9e08ed..e9a8e95041 100644 --- a/app/transform_tool.c +++ b/app/transform_tool.c @@ -201,7 +201,7 @@ transform_options_new (void) /* the new transform tool options structure */ options = (TransformOptions *) g_malloc (sizeof (TransformOptions)); tool_options_init ((ToolOptions *) options, - _("Transform Tool Options"), + N_("Transform Tool Options"), transform_options_reset); options->type = options->type_d = ROTATE; options->smoothing = options->smoothing_d = TRUE; diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 300375f881..2fa4107e63 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -1248,9 +1248,9 @@ ed_close_callback(GtkWidget *widget, gpointer client_data) static void ed_new_gradient_callback(GtkWidget *widget, gpointer client_data) { - query_string_box(_("New gradient"), - _("Enter a name for the new gradient"), - _("untitled"), + query_string_box(N_("New gradient"), + N_("Enter a name for the new gradient"), + N_("untitled"), NULL, NULL, ed_do_new_gradient_callback, NULL); } /* ed_new_gradient_callback */ @@ -1358,8 +1358,8 @@ ed_copy_gradient_callback(GtkWidget *widget, gpointer client_data) name = g_strdup_printf(_("%s copy"), curr_gradient->name); - query_string_box(_("Copy gradient"), - _("Enter a name for the copied gradient"), + query_string_box(N_("Copy gradient"), + N_("Enter a name for the copied gradient"), name, NULL, NULL, ed_do_copy_gradient_callback, NULL); @@ -1588,8 +1588,8 @@ ed_rename_grads_callback(GtkWidget *widget, gpointer client_data) if(curr_gradient == NULL) return; - query_string_box(_("Rename gradient"), - _("Enter a new name for the gradient"), + query_string_box(N_("Rename gradient"), + N_("Enter a new name for the gradient"), curr_gradient->name, NULL, NULL, ed_do_rename_gradient_callback, curr_gradient); diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 68785c5309..79f0d09c1d 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -1050,8 +1050,8 @@ static void palette_new_entries_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("New Palette"), - _("Enter a name for new palette"), + query_string_box (N_("New Palette"), + N_("Enter a name for new palette"), NULL, NULL, NULL, palette_add_entries_callback, client_data); @@ -2416,8 +2416,8 @@ static void palette_merge_dialog_callback (GtkWidget *w, gpointer client_data) { - query_string_box (_("Merge Palette"), - _("Enter a name for merged palette"), + query_string_box (N_("Merge Palette"), + N_("Enter a name for merged palette"), NULL, NULL, NULL, palette_merge_entries_callback, client_data);