Commit cb80e23d authored by Manish Singh's avatar Manish Singh

applied gimp-stric-981116-1, lots o files changes in app. i18n patch.

* applied gimp-stric-981116-1, lots o files changes in app. i18n patch.

* plug-ins/gfig/gfig.c: applied gimp-tml-981121-0, use proper PDB params

-Yosh
parent 25f3cc8d
Mon Nov 23 06:44:10 PST 1998 Manish Singh <yosh@gimp.org>
* applied gimp-stric-981116-1, lots o files changes in app. i18n
patch.
* plug-ins/gfig/gfig.c: applied gimp-tml-981121-0, use proper PDB
params
Mon Nov 23 01:17:57 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: require GTK+ 1.1.5
......
......@@ -23,12 +23,12 @@
#include "libgimp/gimpfeatures.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "about_dialog.h"
#include "interface.h"
#include "config.h"
#define ANIMATION_STEPS 16
#define ANIMATION_SIZE 2
......
......@@ -18,6 +18,9 @@
#include "appenv.h"
#include "actionarea.h"
#include "config.h"
#include "libgimp/gimpintl.h"
void
build_action_area (GtkDialog * dlg,
ActionAreaItem * actions,
......@@ -31,7 +34,7 @@ build_action_area (GtkDialog * dlg,
for (i = 0; i < num_actions; i++)
{
button = gtk_button_new_with_label (actions[i].label);
button = gtk_button_new_with_label (gettext(actions[i].label));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (dlg->action_area), button, TRUE, TRUE, 0);
......
......@@ -103,7 +103,7 @@ create_airbrush_options (void)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Rate"));
label = gtk_label_new (_("Rate: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -121,7 +121,7 @@ create_airbrush_options (void)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Pressure"));
label = gtk_label_new (_("Pressure: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -29,6 +29,8 @@
#include "image_map.h"
#include "interface.h"
#include "libgimp/gimpintl.h"
#define HUE_PARTITION_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK
#define TEXT_WIDTH 45
......@@ -317,7 +319,7 @@ tools_new_hue_saturation ()
/* The tool options */
if (!hue_saturation_options)
hue_saturation_options = tools_register_no_options (HUE_SATURATION, "Hue-Saturation Options");
hue_saturation_options = tools_register_no_options (HUE_SATURATION, _("Hue-Saturation Options"));
tool = (Tool *) g_malloc (sizeof (Tool));
private = (HueSaturation *) g_malloc (sizeof (HueSaturation));
......@@ -361,7 +363,7 @@ hue_saturation_initialize (GDisplay *gdisp)
if (! drawable_color (gimage_active_drawable (gdisp->gimage)))
{
g_message ("Hue-Saturation operates only on RGB color drawables.");
g_message (_("Hue-Saturation operates only on RGB color drawables."));
return;
}
......@@ -407,8 +409,8 @@ hue_saturation_free ()
/* the action area structure */
static ActionAreaItem action_items[] =
{
{ "OK", hue_saturation_ok_callback, NULL, NULL },
{ "Cancel", hue_saturation_cancel_callback, NULL, NULL }
{ N_("OK"), hue_saturation_ok_callback, NULL, NULL },
{ N_("Cancel"), hue_saturation_cancel_callback, NULL, NULL }
};
static HueSaturationDialog *
......@@ -430,13 +432,13 @@ hue_saturation_new_dialog ()
int i;
char *hue_partition_names[7] =
{
"Master",
"R",
"Y",
"G",
"C",
"B",
"M"
N_("Master"),
N_("R"),
N_("Y"),
N_("G"),
N_("C"),
N_("B"),
N_("M")
};
ActionCallback hue_partition_callbacks[7] =
{
......@@ -456,7 +458,7 @@ hue_saturation_new_dialog ()
/* The shell and main vbox */
hsd->shell = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (hsd->shell), "hue_saturation", "Gimp");
gtk_window_set_title (GTK_WINDOW (hsd->shell), "Hue-Saturation");
gtk_window_set_title (GTK_WINDOW (hsd->shell), _("Hue-Saturation"));
/* handle the wm close signal */
gtk_signal_connect (GTK_OBJECT (hsd->shell), "delete_event",
......@@ -518,7 +520,7 @@ hue_saturation_new_dialog ()
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
label = gtk_label_new ("Hue / Lightness / Saturation Adjustments");
label = gtk_label_new (_("Hue / Lightness / Saturation Adjustments"));
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -528,7 +530,7 @@ hue_saturation_new_dialog ()
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
/* Create the hue scale widget */
label = gtk_label_new ("Hue");
label = gtk_label_new (_("Hue"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 2, 2);
......@@ -562,7 +564,7 @@ hue_saturation_new_dialog ()
/* Create the lightness scale widget */
label = gtk_label_new ("Lightness");
label = gtk_label_new (_("Lightness"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 2, 2);
......@@ -596,7 +598,7 @@ hue_saturation_new_dialog ()
/* Create the saturation scale widget */
label = gtk_label_new ("Saturation");
label = gtk_label_new (_("Saturation"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 2, 2);
......@@ -619,7 +621,7 @@ hue_saturation_new_dialog ()
hsd->saturation_text = gtk_entry_new ();
gtk_widget_set_usize (hsd->saturation_text, TEXT_WIDTH, TEXT_HEIGHT);
gtk_table_attach (GTK_TABLE (table), hsd->saturation_text, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 2, 2);
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 3, 2);
gtk_signal_connect (GTK_OBJECT (hsd->saturation_text), "changed",
(GtkSignalFunc) hue_saturation_saturation_text_update,
hsd);
......@@ -634,7 +636,7 @@ hue_saturation_new_dialog ()
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
/* The preview toggle */
toggle = gtk_check_button_new_with_label ("Preview");
toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), hsd->preview);
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
......@@ -731,7 +733,7 @@ static void
hue_saturation_preview (HueSaturationDialog *hsd)
{
if (!hsd->image_map)
g_message ("hue_saturation_preview(): No image map");
g_message (_("hue_saturation_preview(): No image map"));
active_tool->preserve = TRUE;
image_map_apply (hsd->image_map, hue_saturation, (void *) hsd);
active_tool->preserve = FALSE;
......
......@@ -167,7 +167,7 @@ create_bucket_options (void)
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Fill Opacity"));
label = gtk_label_new (_("Fill Opacity: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -186,7 +186,7 @@ create_bucket_options (void)
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Fill Threshold"));
label = gtk_label_new (_("Fill Threshold: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -205,7 +205,7 @@ create_bucket_options (void)
hbox = gtk_hbox_new (FALSE, 1);
gtk_container_border_width (GTK_CONTAINER (hbox), 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Mode:"));
label = gtk_label_new (_("Mode: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
menu = create_paint_mode_menu (bucket_fill_paint_mode_callback,NULL);
option_menu = gtk_option_menu_new ();
......@@ -216,7 +216,7 @@ create_bucket_options (void)
gtk_widget_show (hbox);
/* the radio frame and box */
radio_frame = gtk_frame_new (_("Fill Type"));
radio_frame = gtk_frame_new (_("Fill Type: "));
gtk_box_pack_start (GTK_BOX (vbox), radio_frame, FALSE, FALSE, 0);
radio_box = gtk_vbox_new (FALSE, 1);
......@@ -226,7 +226,7 @@ create_bucket_options (void)
/* the radio buttons */
for (i = 0; i < 2; i++)
{
radio_button = gtk_radio_button_new_with_label (group, button_names[i]);
radio_button = gtk_radio_button_new_with_label (group, gettext(button_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
(GtkSignalFunc) bucket_fill_mode_callback,
......
......@@ -19,6 +19,9 @@
#include "buildmenu.h"
#include "interface.h"
#include "config.h"
#include "libgimp/gimpintl.h"
GtkWidget *
build_menu (MenuItem *items,
GtkAccelGroup *accel_group)
......@@ -38,7 +41,7 @@ build_menu (MenuItem *items,
}
else
{
menu_item = gtk_menu_item_new_with_label (items->label);
menu_item = gtk_menu_item_new_with_label (gettext(items->label));
gtk_container_add (GTK_CONTAINER (menu), menu_item);
if (items->accelerator_key && accel_group)
......
......@@ -141,7 +141,7 @@ create_clone_options (void)
/* the radio buttons */
for (i = 0; i < 2; i++)
{
radio_button = gtk_radio_button_new_with_label (group, button_names[i]);
radio_button = gtk_radio_button_new_with_label (group, gettext(button_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
(GtkSignalFunc) clone_type_callback,
......
......@@ -150,7 +150,7 @@ create_convolve_options (void)
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Pressure"));
label = gtk_label_new (_("Pressure: "));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -171,7 +171,7 @@ create_convolve_options (void)
/* the radio buttons */
for (i = 0; i < 2; i++)
{
radio_button = gtk_radio_button_new_with_label (group, button_names[i]);
radio_button = gtk_radio_button_new_with_label (group, gettext(button_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_box_pack_start (GTK_BOX (radio_box), radio_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
......
......@@ -32,6 +32,8 @@
#include "tools.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
#include "tile_manager_pvt.h"
#include "drawable_pvt.h"
......@@ -279,7 +281,7 @@ edit_paste (GImage *gimage,
int cx, cy;
/* Make a new floating layer */
float_layer = layer_from_tiles (gimage, drawable, paste, "Pasted Layer", OPAQUE_OPACITY, NORMAL);
float_layer = layer_from_tiles (gimage, drawable, paste, _("Pasted Layer"), OPAQUE_OPACITY, NORMAL);
if (float_layer)
{
......@@ -586,9 +588,9 @@ paste_named_buffer (GDisplay *gdisp)
{
static ActionAreaItem action_items[3] =
{
{ "Paste", named_buffer_paste_callback, NULL, NULL },
{ "Delete", named_buffer_delete_callback, NULL, NULL },
{ "Cancel", named_buffer_cancel_callback, NULL, NULL }
{ N_("Paste"), named_buffer_paste_callback, NULL, NULL },
{ N_("Delete"), named_buffer_delete_callback, NULL, NULL },
{ N_("Cancel"), named_buffer_cancel_callback, NULL, NULL }
};
PasteNamedDlg *pn_dlg;
GtkWidget *vbox;
......@@ -601,7 +603,7 @@ paste_named_buffer (GDisplay *gdisp)
pn_dlg->shell = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", "Gimp");
gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), _("Paste Named Buffer"));
gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (pn_dlg->shell), "delete_event",
......@@ -613,7 +615,7 @@ paste_named_buffer (GDisplay *gdisp)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pn_dlg->shell)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
label = gtk_label_new ("Select a buffer to paste:");
label = gtk_label_new (_("Select a buffer to paste:"));
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
gtk_widget_show (label);
......@@ -632,7 +634,7 @@ paste_named_buffer (GDisplay *gdisp)
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
paste_into = gtk_check_button_new_with_label ("Replace Current Selection");
paste_into = gtk_check_button_new_with_label (_("Replace Current Selection"));
gtk_box_pack_start (GTK_BOX (vbox), paste_into, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (paste_into), "toggled",
(GtkSignalFunc) named_buffer_paste_into_update,
......@@ -694,7 +696,7 @@ 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", NULL,
query_string_box (_("Cut Named"), _("Enter a name for this buffer"), NULL,
cut_named_buffer_callback, gdisp);
return TRUE;
}
......@@ -723,7 +725,7 @@ named_edit_copy (void *gdisp_ptr)
gdisp = (GDisplay *) gdisp_ptr;
query_string_box ("Copy Named", "Enter a name for this buffer", NULL,
query_string_box (_("Copy Named"), _("Enter a name for this buffer"), NULL,
copy_named_buffer_callback, gdisp);
return TRUE;
}
......
......@@ -25,6 +25,8 @@
#include "gimprc.h"
#include "brush_header.h"
#include "libgimp/gimpintl.h"
enum{
DIRTY,
RENAME,
......@@ -195,14 +197,14 @@ gimp_brush_load(GimpBrush *brush, char *filename)
brush->name = (char *) g_malloc (sizeof (char) * bn_size);
if ((fread (brush->name, 1, bn_size, fp)) < bn_size)
{
g_message ("Error in GIMP brush file...aborting.");
g_message (_("Error in GIMP brush file...aborting."));
fclose (fp);
gimp_object_destroy (brush);
return;
}
}
else
brush->name = g_strdup ("Unnamed");
brush->name = g_strdup (_("Unnamed"));
switch(header.version)
{
......@@ -220,10 +222,10 @@ gimp_brush_load(GimpBrush *brush, char *filename)
/* Read the brush mask data */
if ((fread (temp_buf_data (brush->mask), 1, header.width * header.height,
fp)) < header.width * header.height)
g_message ("GIMP brush file appears to be truncated.");
g_message (_("GIMP brush file appears to be truncated."));
break;
default:
g_message ("Unknown brush format version #%d in \"%s\"\n",
g_message (_("Unknown brush format version #%d in \"%s\"\n"),
header.version, filename);
fclose (fp);
gimp_object_destroy (brush);
......
......@@ -25,6 +25,8 @@
#include "gimprc.h"
#include "brush_header.h"
#include "libgimp/gimpintl.h"
enum{
DIRTY,
RENAME,
......@@ -195,14 +197,14 @@ gimp_brush_load(GimpBrush *brush, char *filename)
brush->name = (char *) g_malloc (sizeof (char) * bn_size);
if ((fread (brush->name, 1, bn_size, fp)) < bn_size)
{
g_message ("Error in GIMP brush file...aborting.");
g_message (_("Error in GIMP brush file...aborting."));
fclose (fp);
gimp_object_destroy (brush);
return;
}
}
else
brush->name = g_strdup ("Unnamed");
brush->name = g_strdup (_("Unnamed"));
switch(header.version)
{
......@@ -220,10 +222,10 @@ gimp_brush_load(GimpBrush *brush, char *filename)
/* Read the brush mask data */
if ((fread (temp_buf_data (brush->mask), 1, header.width * header.height,
fp)) < header.width * header.height)
g_message ("GIMP brush file appears to be truncated.");
g_message (_("GIMP brush file appears to be truncated."));
break;
default:
g_message ("Unknown brush format version #%d in \"%s\"\n",
g_message (_("Unknown brush format version #%d in \"%s\"\n"),
header.version, filename);
fclose (fp);
gimp_object_destroy (brush);
......
......@@ -44,7 +44,7 @@ image_equalize (gimage_ptr)
if (drawable_indexed (drawable))
{
g_message ("Equalize does not operate on indexed drawables.");
g_message (_("Equalize does not operate on indexed drawables."));
return;
}
equalize (gimage, drawable, mask_only);
......
......@@ -24,6 +24,8 @@
#include "invert.h"
#include "gimage.h"
#include "libgimp/gimpintl.h"
static void invert (GimpDrawable *);
static Argument * invert_invoker (Argument *);
......@@ -42,7 +44,7 @@ image_invert (gimage_ptr)
if (drawable_indexed (drawable))
{
g_message ("Invert does not operate on indexed drawables.");
g_message (_("Invert does not operate on indexed drawables."));
return;
}
......@@ -52,7 +54,7 @@ image_invert (gimage_ptr)
PDB_END);
if (return_vals[0].value.pdb_int != PDB_SUCCESS)
g_message ("Invert operation failed.");
g_message (_("Invert operation failed."));
procedural_db_destroy_args (return_vals, nreturn_vals);
}
......
......@@ -26,6 +26,7 @@
#include "gimage_mask.h"
#include "parasitelist.h"
#include "libgimp/gimpintl.h"
enum {
INVALIDATE_PREVIEW,
......@@ -158,7 +159,7 @@ gimp_drawable_fill (GimpDrawable *drawable, guchar r, guchar g,
c[ALPHA_I_PIX] = a;
break;
default:
g_message ("Can't fill unknown image type.");
g_message (_("Can't fill unknown image type."));
break;
}
......@@ -600,7 +601,7 @@ gimp_drawable_configure (GimpDrawable *drawable,
int alpha;
if (!name)
name = "unnamed";
name = _("unnamed");
switch (type)
{
......@@ -617,7 +618,7 @@ gimp_drawable_configure (GimpDrawable *drawable,
case INDEXEDA_GIMAGE:
bpp = 2; alpha = 1; break;
default:
g_message ("Layer type %d not supported.", type);
g_message (_("Layer type %d not supported."), type);
return;
}
......
......@@ -32,6 +32,8 @@
#include "tools.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
#include "tile_manager_pvt.h"
#include "drawable_pvt.h"
......@@ -279,7 +281,7 @@ edit_paste (GImage *gimage,
int cx, cy;
/* Make a new floating layer */
float_layer = layer_from_tiles (gimage, drawable, paste, "Pasted Layer", OPAQUE_OPACITY, NORMAL);
float_layer = layer_from_tiles (gimage, drawable, paste, _("Pasted Layer"), OPAQUE_OPACITY, NORMAL);
if (float_layer)
{
......@@ -586,9 +588,9 @@ paste_named_buffer (GDisplay *gdisp)
{
static ActionAreaItem action_items[3] =
{
{ "Paste", named_buffer_paste_callback, NULL, NULL },
{ "Delete", named_buffer_delete_callback, NULL, NULL },
{ "Cancel", named_buffer_cancel_callback, NULL, NULL }
{ N_("Paste"), named_buffer_paste_callback, NULL, NULL },
{ N_("Delete"), named_buffer_delete_callback, NULL, NULL },
{ N_("Cancel"), named_buffer_cancel_callback, NULL, NULL }
};
PasteNamedDlg *pn_dlg;
GtkWidget *vbox;
......@@ -601,7 +603,7 @@ paste_named_buffer (GDisplay *gdisp)
pn_dlg->shell = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", "Gimp");
gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), _("Paste Named Buffer"));
gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (pn_dlg->shell), "delete_event",
......@@ -613,7 +615,7 @@ paste_named_buffer (GDisplay *gdisp)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pn_dlg->shell)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
label = gtk_label_new ("Select a buffer to paste:");
label = gtk_label_new (_("Select a buffer to paste:"));
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
gtk_widget_show (label);
......@@ -632,7 +634,7 @@ paste_named_buffer (GDisplay *gdisp)
set_list_of_named_buffers (pn_dlg->list);
gtk_widget_show (pn_dlg->list);
paste_into = gtk_check_button_new_with_label ("Replace Current Selection");
paste_into = gtk_check_button_new_with_label (_("Replace Current Selection"));
gtk_box_pack_start (GTK_BOX (vbox), paste_into, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (paste_into), "toggled",
(GtkSignalFunc) named_buffer_paste_into_update,
......@@ -694,7 +696,7 @@ 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", NULL,
query_string_box (_("Cut Named"), _("Enter a name for this buffer"), NULL,
cut_named_buffer_callback, gdisp);
return TRUE;
}
......@@ -723,7 +725,7 @@ named_edit_copy (void *gdisp_ptr)
gdisp = (GDisplay *) gdisp_ptr;
query_string_box ("Copy Named", "Enter a name for this buffer", NULL,
query_string_box (_("Copy Named"), _("Enter a name for this buffer"), NULL,
copy_named_buffer_callback, gdisp);
return TRUE;
}
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <string.h>
#include "gimpimageP.h"
#include "gimpimageP.h"
#include "drawable.h"
#include "floating_sel.h"
#include "gdisplay.h"
......@@ -30,6 +30,8 @@
#include "undo.h"
#include "gimpsignal.h"
#include "libgimp/gimpintl.h"
#include "tile_manager.h"
#include "tile.h"
#include "layer_pvt.h"
......@@ -532,7 +534,7 @@ gimp_image_apply_image (GimpImage *gimage, GimpDrawable *drawable, PixelRegion *
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;
}
......@@ -626,7 +628,7 @@ gimp_image_replace_image (GimpImage *gimage, GimpDrawable *drawable, PixelRegion
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;
}
......@@ -904,7 +906,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{
image->tattoo_state++;
if (image->tattoo_state <= 0)
g_warning("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
g_warning(_("Tattoo state has become corrupt (2.1 billion operation limit exceded)"));
return (image->tattoo_state);
}
......@@ -948,7 +950,7 @@ project_indexed (GimpImage *gimage, Layer *layer,
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."));
}
......@@ -1710,7 +1712,7 @@ gimp_image_raise_layer (GimpImage *gimage, Layer *layer_arg)
}
else
{
g_message ("Layer cannot be raised any further");
g_message (_("Layer cannot be raised any further"));
return NULL;
}
}
......@@ -1782,7 +1784,7 @@ gimp_image_lower_layer (GimpImage *gimage, Layer *layer_arg)
}
else
{
g_message ("Layer cannot be lowered any further");
g_message (_("Layer cannot be lowered any further"));
return NULL;
}
}
......@@ -1811,12 +1813,12 @@ gimp_image_raise_layer_to_top (GimpImage *gimage, Layer *layer_arg)
if (layer == layer_arg)
{
/* layer_arg is already the top_layer */
g_message ("Layer is already on top");
g_message (_("Layer is already on top"));
return NULL;
}
if (! layer_has_alpha (layer_arg))
{
g_message ("cant raise Layer without alpha");
g_message (_("Can't raise Layer without alpha"));
return NULL;
}
......@@ -1908,7 +1910,7 @@ gimp_image_lower_layer_to_bottom (GimpImage *gimage, Layer *layer_arg)
if (layer == layer_arg)
{
/* there is no next layer below layer_arg */
g_message ("Layer is already on bottom");
g_message (_("Layer is already on bottom"));
}
/* bottom is reached, we can stop now */
break;
......@@ -1921,7 +1923,7 @@ gimp_image_lower_layer_to_bottom (GimpImage *gimage, Layer *layer_arg)
}
else
{
g_message ("BG has no alpha, layer was placed above");
g_message (_("BG has no alpha, layer was placed above"));
break;
}
......@@ -1978,7 +1980,7 @@ gimp_image_merge_visible_layers (GimpImage *gimage, MergeType merge_type)
}
else
{
g_message ("There are not enough visible layers for a merge.\nThere must be at least two.");
g_message (_("There are not enough visible layers for a merge.\nThere must be at least two."));
g_slist_free (merge_list);
return NULL;
}
......@@ -2050,7 +2052,7 @@ gimp_image_merge_down (GimpImage *gimage,
}
else
{
g_message ("There are not enough visible layers for a merge down.");
g_message (_("There are not enough visible layers for a merge down."));
g_slist_free (merge_list);
return NULL;
}
......@@ -2161,7 +2163,7 @@ gimp_image_merge_layers (GimpImage *gimage, GSList *merge_list, MergeType merge_
type, drawable_get_name (GIMP_DRAWABLE(layer)), 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;
}
......@@ -2194,7 +2196,7 @@ gimp_image_merge_layers (GimpImage *gimage, GSList *merge_list, MergeType merge_