Commit ba211f07 authored by Sven Neumann's avatar Sven Neumann

i18n patch from Daniel Egger


--Sven
parent 36bed6e3
Thu Sep 23 13:31:41 MEST 1999 Sven Neumann <sven@gimp.org>
applied internationalization patch from Daniel Egger
* app/about_dialog.c
* app/app_procs.c
* app/batch.c
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/brush_select.c
* app/channels_dialog.c
* app/fileops.c
* app/gdisplay_ops.c
* app/gdisplay.c
* app/gimpimage.c
* app/install.c
* app/layers_dialog.c
* app/main.c
* app/menus.c
* app/menus.h
* app/paths_dialog.c
* app/plug_in.c:
Debugging messages shouldn't be marked for translation.
gimp_menu_set_sensitivity_locale () renamed to
gimp_menu_set_sensitivity_glue ()
* libgimp/gimpintl.h
* libgimp/stdplugins-intl.h: moved the internationalization stuff
into a macro similar to that the gnome folks use.
* po/POTFILES.in: undo_history.c was missing here.
Wed Sep 22 23:51:24 CDT 1999 James Mitchell <mitchell@gimp.org>
* tips/gimp_tips.it.txt: Translations from Daniele Medri
......
......@@ -203,7 +203,7 @@ about_dialog_create (gint timeout)
style = gtk_style_new ();
gdk_font_unref (style->font);
style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
style->font = gdk_font_load ("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*");
gtk_widget_push_style (style);
label_text = g_strdup_printf("%s%s%s", _("Version "), GIMP_VERSION,
......@@ -213,7 +213,7 @@ about_dialog_create (gint timeout)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Spencer Kimball & Peter Mattis"));
label = gtk_label_new ("Spencer Kimball & Peter Mattis");
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
......
......@@ -204,13 +204,13 @@ plug_in_init_shm (void)
shm_ID = shmget (IPC_PRIVATE, TILE_WIDTH * TILE_HEIGHT * 4, IPC_CREAT | 0777);
if (shm_ID == -1)
g_message (_("shmget failed...disabling shared memory tile transport"));
g_message ("shmget failed...disabling shared memory tile transport");
else
{
shm_addr = (guchar*) shmat (shm_ID, 0, 0);
if (shm_addr == (guchar*) -1)
{
g_message (_("shmat failed...disabling shared memory tile transport"));
g_message ("shmat failed...disabling shared memory tile transport");
shm_ID = -1;
}
......@@ -690,7 +690,7 @@ plug_in_def_add (PlugInDef *plug_in_def)
}
write_pluginrc = TRUE;
g_print (_("\"%s\" executable not found\n"), plug_in_def->prog);
g_print ("\"%s\" executable not found\n", plug_in_def->prog);
g_free (plug_in_def->prog);
g_free (plug_in_def);
}
......@@ -825,7 +825,7 @@ plug_in_open (PlugIn *plug_in)
*/
if ((pipe (my_read) == -1) || (pipe (my_write) == -1))
{
g_message (_("unable to open pipe"));
g_message ("unable to open pipe");
return 0;
}
......@@ -914,7 +914,7 @@ plug_in_open (PlugIn *plug_in)
else if (plug_in->pid == -1)
#endif
{
g_message (_("unable to run plug-in: %s"), plug_in->args[0]);
g_message ("unable to run plug-in: %s", plug_in->args[0]);
plug_in_destroy (plug_in);
return 0;
}
......@@ -1282,8 +1282,8 @@ plug_in_set_menu_sensitivity (GimpImageType type)
menus_set_sensitive (proc_def->menu_path, sensitive);
if (last_plug_in && (last_plug_in == &(proc_def->db_info)))
{
menus_set_sensitive_locale ("<Image>", N_("/Filters/Repeat last"), sensitive);
menus_set_sensitive_locale ("<Image>", N_("/Filters/Re-show last"), sensitive);
menus_set_sensitive_glue ("<Image>", N_("/Filters/Repeat last"), sensitive);
menus_set_sensitive_glue ("<Image>", N_("/Filters/Re-show last"), sensitive);
}
}
}
......@@ -1645,8 +1645,8 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
if ((proc_install->nparams < 1) ||
(proc_install->params[0].type != PDB_INT32))
{
g_message (_("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args"),
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
}
......@@ -1658,8 +1658,8 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[1].type != PDB_IMAGE) ||
(proc_install->params[2].type != PDB_DRAWABLE))
{
g_message (_("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args"),
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
}
......@@ -1671,8 +1671,8 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[1].type != PDB_STRING) ||
(proc_install->params[2].type != PDB_STRING))
{
g_message (_("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args"),
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
}
......@@ -1686,17 +1686,17 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[3].type != PDB_STRING) ||
(proc_install->params[4].type != PDB_STRING))
{
g_message (_("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args"),
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
}
}
else
{
g_message (_("plug-in \"%s\" attempted to install procedure \"%s\" in "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" in "
"an invalid menu location. Use either \"<Toolbox>\", \"<Image>\", "
"\"<Load>\", or \"<Save>\"."),
"\"<Load>\", or \"<Save>\".",
current_plug_in->args[0], proc_install->name);
return;
}
......@@ -1714,9 +1714,9 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
proc_install->params[i].type == PDB_STRINGARRAY) &&
proc_install->params[i-1].type != PDB_INT32)
{
g_message (_("plug_in \"%s\" attempted to install procedure \"%s\" "
g_message ("plug_in \"%s\" attempted to install procedure \"%s\" "
"which fails to comply with the array parameter "
"passing standard. Argument %d is noncompliant."),
"passing standard. Argument %d is noncompliant.",
current_plug_in->args[0], proc_install->name, i);
return;
}
......@@ -2146,7 +2146,7 @@ plug_in_init_file (char *filename)
if (g_strcasecmp (name, plug_in_name) == 0)
{
g_print (_("duplicate plug-in: \"%s\" (skipping)\n"), filename);
g_print ("duplicate plug-in: \"%s\" (skipping)\n"), filename;
return;
}
......@@ -2354,7 +2354,7 @@ plug_in_callback (GtkWidget *widget,
break;
default:
g_error (_("Unknown procedure type."));
g_error ("Unknown procedure type.");
g_free (args);
return;
}
......@@ -2435,7 +2435,7 @@ plug_in_proc_def_dead (void *freed_proc_def)
PlugInDef *plug_in_def;
PlugInProcDef *proc_def = freed_proc_def;
g_warning (_("removing duplicate PDB procedure \"%s\""),
g_warning ("removing duplicate PDB procedure \"%s\"",
proc_def->db_info.name);
/* search the plugin list to see if any plugins had references to
......@@ -2691,7 +2691,7 @@ plug_in_params_to_args (GPParam *params,
colorarray[2] = params[i].data.d_color.blue;
break;
case PDB_REGION:
g_message (_("the \"region\" arg type is not currently supported"));
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
args[i].value.pdb_int = params[i].data.d_display;
......@@ -2856,7 +2856,7 @@ plug_in_args_to_params (Argument *args,
}
break;
case PDB_REGION:
g_message (_("the \"region\" arg type is not currently supported"));
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
params[i].data.d_display = args[i].value.pdb_int;
......@@ -2973,7 +2973,7 @@ plug_in_params_destroy (GPParam *params,
case PDB_COLOR:
break;
case PDB_REGION:
g_message (_("the \"region\" arg type is not currently supported"));
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
case PDB_IMAGE:
......@@ -3058,7 +3058,7 @@ plug_in_args_destroy (Argument *args,
g_free (args[i].value.pdb_pointer);
break;
case PDB_REGION:
g_message (_("the \"region\" arg type is not currently supported"));
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
case PDB_IMAGE:
......
......@@ -96,8 +96,8 @@
#define LOGO_WIDTH_MIN 300
#define LOGO_HEIGHT_MIN 110
#define NAME "The GIMP"
#define BROUGHT "brought to you by"
#define NAME _("The GIMP")
#define BROUGHT _("brought to you by")
#define AUTHORS "Spencer Kimball and Peter Mattis"
#define SHOW_NEVER 0
......@@ -705,8 +705,8 @@ static void
really_quit_cancel_callback (GtkWidget *widget,
GtkWidget *dialog)
{
menus_set_sensitive_locale ("<Toolbox>", N_("/File/Quit"), TRUE);
menus_set_sensitive_locale ("<Image>", N_("/File/Quit"), TRUE);
menus_set_sensitive_glue ("<Toolbox>", N_("/File/Quit"), TRUE);
menus_set_sensitive_glue ("<Image>", N_("/File/Quit"), TRUE);
gtk_widget_destroy (dialog);
}
......@@ -731,8 +731,8 @@ really_quit_dialog (void)
GtkStyle *style;
GtkWidget *label;
menus_set_sensitive_locale ("<Toolbox>", N_("/File/Quit"), FALSE);
menus_set_sensitive_locale ("<Image>", N_("/File/Quit"), FALSE);
menus_set_sensitive_glue ("<Toolbox>", N_("/File/Quit"), FALSE);
menus_set_sensitive_glue ("<Image>", N_("/File/Quit"), FALSE);
dialog = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (dialog), "really_quit", "Gimp");
......
......@@ -199,7 +199,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs);
if (!tmp_segs)
gimp_fatal_error (_("make_seg(): Unable to reallocate segments array for mask boundary."));
gimp_fatal_error ("make_seg(): Unable to reallocate segments array for mask boundary.");
}
tmp_segs[num_segs].x1 = x1;
......@@ -241,7 +241,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c)
gimp_fatal_error (_("allocate_empty_segs(): Unable to reallocate empty segments array for mask boundary."));
gimp_fatal_error ("allocate_empty_segs(): Unable to reallocate empty segments array for mask boundary.");
}
}
......
......@@ -62,7 +62,7 @@ batch_init ()
if (!eval_proc)
{
g_message (_("script-fu not available: batch mode disabled\n"));
g_message ("script-fu not available: batch mode disabled\n");
return;
}
......@@ -71,7 +71,7 @@ batch_init ()
if (!read_from_stdin)
{
#ifndef NATIVE_WIN32 /* for now */
g_print (_("reading batch commands from stdin\n"));
g_print ("reading batch commands from stdin\n");
gdk_input_add (STDIN_FILENO, GDK_INPUT_READ, batch_read, NULL);
read_from_stdin = TRUE;
#else
......@@ -111,13 +111,13 @@ batch_run_cmd (char *cmd)
switch (vals[0].value.pdb_int)
{
case PDB_EXECUTION_ERROR:
g_print (_("batch command: experienced an execution error.\n"));
g_print ("batch command: experienced an execution error.\n");
break;
case PDB_CALLING_ERROR:
g_print (_("batch command: experienced a calling error.\n"));
g_print ("batch command: experienced a calling error.\n");
break;
case PDB_SUCCESS:
g_print (_("batch command: executed successfully.\n"));
g_print ("batch command: executed successfully.\n");
break;
default:
break;
......@@ -201,7 +201,7 @@ batch_pserver (int run_mode,
if (!pserver_proc)
{
g_message (_("extension_perl_server not available: unable to start the perl server\n"));
g_message ("extension_perl_server not available: unable to start the perl server\n");
return;
}
......@@ -217,13 +217,13 @@ batch_pserver (int run_mode,
switch (vals[0].value.pdb_int)
{
case PDB_EXECUTION_ERROR:
g_print (_("perl server: experienced an execution error.\n"));
g_print ("perl server: experienced an execution error.\n");
break;
case PDB_CALLING_ERROR:
g_print (_("perl server: experienced a calling error.\n"));
g_print ("perl server: experienced a calling error.\n");
break;
case PDB_SUCCESS:
g_print (_("perl server: executed successfully.\n"));
g_print ("perl server: executed successfully.\n");
break;
default:
break;
......
......@@ -1000,7 +1000,7 @@ bezier_select_button_press (Tool *tool,
break;
case BEZIER_EDIT:
if (!bezier_sel->closed)
gimp_fatal_error (_("bezier_select_button_press(): Tried to edit on open bezier curve in edit selection"));
gimp_fatal_error ("bezier_select_button_press(): Tried to edit on open bezier curve in edit selection");
/* erase the handles */
bezier_sel->draw = BEZIER_DRAW_ALL;
......@@ -1280,7 +1280,7 @@ bezier_select_motion (Tool *tool,
}
if (!anchor)
gimp_fatal_error (_("bezier_select_motion(): Encountered orphaned bezier control point"));
gimp_fatal_error ("bezier_select_motion(): Encountered orphaned bezier control point");
if (opposite_control)
{
......@@ -1961,7 +1961,7 @@ bezier_draw_segment (BezierSelect *bezier_sel,
for (i = 0; i < 4; i++)
{
if (!points)
gimp_fatal_error (_("bezier_draw_segment(): Bad bezier segment"));
gimp_fatal_error ("bezier_draw_segment(): Bad bezier segment");
switch (space)
{
......@@ -1978,7 +1978,7 @@ bezier_draw_segment (BezierSelect *bezier_sel,
geometry[i][1] = points->sy;
break;
default:
gimp_fatal_error (_("bezier_draw_segment(): Unknown coordinate space: %d"), space);
gimp_fatal_error ("bezier_draw_segment(): Unknown coordinate space: %d", space);
break;
}
......@@ -2121,7 +2121,7 @@ bezier_convert (BezierSelect *bezier_sel,
int i, j;
if (!bezier_sel->closed)
gimp_fatal_error (_("bezier_convert(): tried to convert an open bezier curve"));
gimp_fatal_error ("bezier_convert(): tried to convert an open bezier curve");
/* destroy previous mask */
if (bezier_sel->mask)
......@@ -2198,7 +2198,7 @@ bezier_convert (BezierSelect *bezier_sel,
list = list->next;
/*
if (!list)
g_message (_("cannot properly scanline convert bezier curve: %d"), i);
g_message ("cannot properly scanline convert bezier curve: %d", i);
else
*/
{
......@@ -2622,7 +2622,7 @@ test_add_point_on_segment (BezierSelect *bezier_sel,
geometry[i][1] = points->sy;
break;
default:
gimp_fatal_error (_("test_add_point_on_segment(): Unknown coordinate space: %d"), space);
gimp_fatal_error ("test_add_point_on_segment(): Unknown coordinate space: %d", space);
break;
}
......@@ -2826,7 +2826,7 @@ bezier_to_selection(BezierSelect *bezier_sel,
/* Call the internal function */
if(!bezier_sel->closed)
{
g_warning("Curve not closed");
g_message(_("Curve not closed!"));
return;
}
......@@ -3205,7 +3205,7 @@ bezier_draw_segment_for_distance (BezierSelect *bezier_sel,
for (i = 0; i < 4; i++)
{
if (!points)
gimp_fatal_error (_("bezier_draw_segment_for_distance(): Bad bezier segment"));
gimp_fatal_error ("bezier_draw_segment_for_distance(): Bad bezier segment");
geometry[i][0] = points->x;
geometry[i][1] = points->y;
......
......@@ -1347,7 +1347,7 @@ gradient_render_pixel (double x,
break;
default:
gimp_fatal_error(_("gradient_render_pixel(): Unknown gradient type %d"),
gimp_fatal_error("gradient_render_pixel(): Unknown gradient type %d",
(int) rbd->gradient_type);
return;
}
......@@ -1485,7 +1485,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown blend mode %d"),
gimp_fatal_error("gradient_fill_region(): Unknown blend mode %d",
(int) blend_mode);
break;
}
......@@ -1526,7 +1526,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown gradient type %d"),
gimp_fatal_error("gradient_fill_region(): Unknown gradient type %d",
(int) gradient_type);
break;
}
......@@ -1548,7 +1548,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown repeat mode %d"),
gimp_fatal_error("gradient_fill_region(): Unknown repeat mode %d",
(int) repeat);
break;
}
......
......@@ -199,7 +199,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs);
if (!tmp_segs)
gimp_fatal_error (_("make_seg(): Unable to reallocate segments array for mask boundary."));
gimp_fatal_error ("make_seg(): Unable to reallocate segments array for mask boundary.");
}
tmp_segs[num_segs].x1 = x1;
......@@ -241,7 +241,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c)
gimp_fatal_error (_("allocate_empty_segs(): Unable to reallocate empty segments array for mask boundary."));
gimp_fatal_error ("allocate_empty_segs(): Unable to reallocate empty segments array for mask boundary.");
}
}
......
......@@ -277,7 +277,7 @@ brush_select_new (gchar *title,
bsp->brush_name = gtk_label_new (_("Active"));
gtk_box_pack_start (GTK_BOX (util_box), bsp->brush_name, FALSE, FALSE, 4);
bsp->brush_size = gtk_label_new ("(0 X 0)");
bsp->brush_size = gtk_label_new (_("(0 X 0)"));
gtk_box_pack_start (GTK_BOX (util_box), bsp->brush_size, FALSE, FALSE, 2);
gtk_widget_show (bsp->brush_name);
......@@ -594,7 +594,7 @@ brush_change_callbacks (BrushSelectP bsp,
PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != PDB_SUCCESS)
g_message (_("failed to run brush callback function"));
g_message ("failed to run brush callback function");
procedural_db_destroy_args (return_vals, nreturn_vals);
}
......@@ -1207,7 +1207,7 @@ update_active_brush_field (BrushSelectP bsp)
gtk_label_set_text (GTK_LABEL (bsp->brush_name), brush->name);
/* Set brush size */
g_snprintf (buf, sizeof (buf), "(%d X %d)",
g_snprintf (buf, sizeof (buf), _("(%d X %d)"),
brush->mask->width, brush->mask->height);
gtk_label_set_text (GTK_LABEL (bsp->brush_size), buf);
......@@ -1264,7 +1264,7 @@ delete_active_brush(BrushSelectP bsp)
select_brush (brush);
}
else
g_message ("Wilber says: \"I don\'t know how to delete that brush.\"");
g_message (_("Wilber says: \"I don\'t know how to delete that brush.\""));
}
static gint
......
......@@ -617,7 +617,7 @@ channels_dialog_set_menu_sensitivity ()
aux_sens = FALSE;
#define SET_SENSITIVE(menu,condition) \
menus_set_sensitive_locale ("<Channels>", (menu), (condition) != 0)
menus_set_sensitive_glue ("<Channels>", (menu), (condition) != 0)
#define SET_OPS_SENSITIVE(button,condition) \
gtk_widget_set_sensitive (channels_ops_buttons[(button)].widget, \
(condition) != 0)
......@@ -692,7 +692,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
gtk_list_select_item (GTK_LIST (channelsD->channel_list), 2);
break;
case AUXILLARY_CHANNEL:
g_error (_("error in %s at %d: this shouldn't happen."),
g_error ("error in %s at %d: this shouldn't happen.",
__FILE__, __LINE__);
break;
}
......@@ -746,7 +746,7 @@ channels_dialog_unset_channel (ChannelWidget *channel_widget)
gtk_list_unselect_item (GTK_LIST (channelsD->channel_list), 2);
break;
case AUXILLARY_CHANNEL:
g_error (_("error in %s at %d: this shouldn't happen."),
g_error ("error in %s at %d: this shouldn't happen.",
__FILE__, __LINE__);
break;
}
......@@ -1139,8 +1139,8 @@ channels_dialog_drag_new_channel_callback (GtkWidget *widget,
}
else
{
g_message (_("channels_dialog_drop_new_channel_callback():\n"
"could not allocate new channel"));
g_message ("channels_dialog_drop_new_channel_callback():\n"
"could not allocate new channel");
}
return_val = TRUE;
......
......@@ -1347,7 +1347,7 @@ gradient_render_pixel (double x,
break;
default:
gimp_fatal_error(_("gradient_render_pixel(): Unknown gradient type %d"),
gimp_fatal_error("gradient_render_pixel(): Unknown gradient type %d",
(int) rbd->gradient_type);
return;
}
......@@ -1485,7 +1485,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown blend mode %d"),
gimp_fatal_error("gradient_fill_region(): Unknown blend mode %d",
(int) blend_mode);
break;
}
......@@ -1526,7 +1526,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown gradient type %d"),
gimp_fatal_error("gradient_fill_region(): Unknown gradient type %d",
(int) gradient_type);
break;
}
......@@ -1548,7 +1548,7 @@ gradient_fill_region (GImage *gimage,
break;
default:
gimp_fatal_error(_("gradient_fill_region(): Unknown repeat mode %d"),
gimp_fatal_error("gradient_fill_region(): Unknown repeat mode %d",
(int) repeat);
break;
}
......
......@@ -666,7 +666,7 @@ gimp_image_apply_image (GimpImage *gimage,
operation = valid_combinations [drawable_type (drawable)][src2PR->bytes];
if (operation == -1)
{
g_message (_("gimp_image_apply_image sent illegal parameters"));
g_message ("gimp_image_apply_image sent illegal parameters");
return;
}
......@@ -762,7 +762,7 @@ gimp_image_replace_image (GimpImage *gimage,
operation = valid_combinations [drawable_type (drawable)][src2PR->bytes];
if (operation == -1)
{
g_message (_("gimp_image_apply_image sent illegal parameters"));
g_message ("gimp_image_apply_image sent illegal parameters");
return;
}
......@@ -1195,7 +1195,7 @@ project_indexed (GimpImage *gimage,
initial_region (src, dest, NULL, gimage->cmap, layer->opacity,
layer->mode, gimage->visible, INITIAL_INDEXED);
else
g_message (_("Unable to project indexed image."));
g_message ("Unable to project indexed image.");
}
static void
......@@ -2666,7 +2666,7 @@ gimp_image_merge_layers (GimpImage *gimage,
OPAQUE_OPACITY, NORMAL_MODE);
if (!merge_layer)
{
g_message (_("gimp_image_merge_layers: could not allocate merge layer"));
g_message ("gimp_image_merge_layers: could not allocate merge layer");
return NULL;
}
......@@ -2697,7 +2697,7 @@ gimp_image_merge_layers (GimpImage *gimage,
OPAQUE_OPACITY, NORMAL_MODE);
if (!merge_layer)
{
g_message (_("gimp_image_merge_layers: could not allocate merge layer"));
g_message ("gimp_image_merge_layers: could not allocate merge layer");
return NULL;
}
......@@ -2736,7 +2736,7 @@ gimp_image_merge_layers (GimpImage *gimage,
operation = valid_combinations<