Commit dfd9d1cc authored by Manish Singh's avatar Manish Singh

i18n patch from gimp-monniaux-050699-1

-Yosh
parent 18e5d0b3
Sat Jun 5 16:19:15 PDT 1999 Manish Singh <yosh@gimp.org>
app/errors.c
app/hue_saturation.c
app/iscissors.c
app/layers_dialog.c
app/levels.c
app/menus.c
app/paint_funcs.c
app/palette.c
app/pattern_select.c
app/plug_in.c
app/posterize.c
app/text_tool.c
app/threshold.c
app/tile.c
app/tile_cache.c
app/tile_manager.c
app/tile_swap.c
app/xcf.c: i18n stuff from gimp-monniaux-050699-1 (partially applied)
Sat Jun 5 14:16:57 PDT 1999 Manish Singh <yosh@gimp.org>
* po-plug-ins/Makefile.in.in: don't conflict with the app translation
......
......@@ -1321,18 +1321,18 @@ plug_in_handle_message (WireMessage *msg)
plug_in_handle_quit ();
break;
case GP_CONFIG:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_REQ:
plug_in_handle_tile_req (msg->data);
break;
case GP_TILE_ACK:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_DATA:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_PROC_RUN:
......@@ -1343,7 +1343,7 @@ plug_in_handle_message (WireMessage *msg)
plug_in_close (current_plug_in, FALSE);
break;
case GP_TEMP_PROC_RUN:
g_message (_("plug_in_handle_message(): received a temp proc run message (should not happen)"));
g_warning ("plug_in_handle_message(): received a temp proc run message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TEMP_PROC_RETURN:
......@@ -1397,21 +1397,21 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writechannel, &tile_data))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (!wire_read_msg (current_readchannel, &msg))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_DATA)
{
g_message (_("expected tile data and received: %d"), msg.type);
g_warning ("expected tile data and received: %d", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1425,7 +1425,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_message (_("plug-in requested invalid drawable (killing)"));
g_warning ("plug-in requested invalid drawable (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1433,7 +1433,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_info->tile_num, TRUE, TRUE);
if (!tile)
{
g_message (_("plug-in requested invalid tile (killing)"));
g_warning ("plug-in requested invalid tile (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1448,7 +1448,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
wire_destroy (&msg);
if (!gp_tile_ack_write (current_writechannel))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1462,7 +1462,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_message (_("plug-in requested invalid drawable (killing)"));
g_warning ("plug-in requested invalid drawable (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1470,7 +1470,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_req->tile_num, TRUE, FALSE);
if (!tile)
{
g_message (_("plug-in requested invalid tile (killing)"));
g_warning ("plug-in requested invalid tile (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1490,7 +1490,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writechannel, &tile_data))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1499,14 +1499,14 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!wire_read_msg (current_readchannel, &msg))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_ACK)
{
g_message (_("expected tile ack and received: %d"), msg.type);
g_warning ("expected tile ack and received: %d", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1530,7 +1530,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_message (_("PDB lookup failed on %s"), proc_run->name);
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
}
......@@ -1554,7 +1554,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!gp_proc_return_write (current_writechannel, &proc_return))
{
g_message (_("plug_in_handle_proc_run: ERROR"));
g_warning ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1598,7 +1598,7 @@ plug_in_handle_proc_return (GPProcReturn *proc_return)
plug_in_push (blocked->plug_in);
if (!gp_proc_return_write (current_writechannel, proc_return))
{
g_message (_("plug_in_handle_proc_run: ERROR"));
g_message ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -2315,7 +2315,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_message (_("Uh-oh, no active gdisplay for the plug-in!"));
g_warning ("Uh-oh, no active gdisplay for the plug-in!");
g_free (args);
return;
}
......@@ -2338,7 +2338,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_message (_("Uh-oh, no active gdisplay for the temporary procedure!"));
g_warning ("Uh-oh, no active gdisplay for the temporary procedure!");
g_free (args);
return;
}
......
......@@ -714,7 +714,7 @@ static void
hue_saturation_preview (HueSaturationDialog *hsd)
{
if (!hsd->image_map)
g_message (_("hue_saturation_preview(): No image map"));
g_warning ("hue_saturation_preview(): No image map");
active_tool->preserve = TRUE;
image_map_apply (hsd->image_map, hue_saturation, (void *) hsd);
active_tool->preserve = FALSE;
......
......@@ -431,7 +431,7 @@ static void
threshold_preview (ThresholdDialog *td)
{
if (!td->image_map)
g_message (_("threshold_preview(): No image map"));
g_warning ("threshold_preview(): No image map");
image_map_apply (td->image_map, threshold, (void *) td);
}
......
......@@ -111,7 +111,7 @@ tile_cache_insert (Tile *tile)
{
if (!tile_cache_zorch_next())
{
g_warning (_("cache: unable to find room for a tile"));
g_warning ("cache: unable to find room for a tile");
goto out;
}
}
......
......@@ -330,7 +330,7 @@ tile_manager_map_tile (TileManager *tm,
if ((xpixel < 0) || (xpixel >= tm->width) ||
(ypixel < 0) || (ypixel >= tm->height))
{
g_warning (_("tile_manager_map_tile: tile co-ord out of range."));
g_warning ("tile_manager_map_tile: tile co-ord out of range.");
return;
}
......@@ -358,7 +358,7 @@ tile_manager_map (TileManager *tm,
if ((tile_num < 0) || (tile_num >= ntiles))
{
g_warning (_("tile_manager_map: tile out of range."));
g_warning ("tile_manager_map: tile out of range.");
return;
}
......@@ -404,7 +404,7 @@ tile_manager_map (TileManager *tm,
if ((*tile_ptr)->ewidth != srctile->ewidth ||
(*tile_ptr)->eheight != srctile->eheight ||
(*tile_ptr)->bpp != srctile->bpp) {
g_warning (_("tile_manager_map: nonconformant map (%p -> %p)"),
g_warning ("tile_manager_map: nonconformant map (%p -> %p)",
srctile, *tile_ptr);
}
tile_detach (*tile_ptr, tm, tile_num);
......@@ -487,7 +487,7 @@ tile_manager_get_tile_coordinates (TileManager *tm, Tile *tile, int *x, int *y)
if (tl == NULL)
{
g_warning (_("tile_manager_get_tile_coordinates: tile not attached to manager"));
g_warning ("tile_manager_get_tile_coordinates: tile not attached to manager");
return;
}
......@@ -508,7 +508,7 @@ tile_manager_map_over_tile (TileManager *tm, Tile *tile, Tile *srctile)
if (tl == NULL)
{
g_warning (_("tile_manager_map_over_tile: tile not attached to manager"));
g_warning ("tile_manager_map_over_tile: tile not attached to manager");
return;
}
......
......@@ -143,7 +143,7 @@ tile_swap_exit1 (gpointer key,
DefSwapFile *def_swap_file;
if (tile_ref_count != 0)
g_message (_("tile ref count balance: %d\n"), tile_ref_count);
g_warning ("tile ref count balance: %d\n", tile_ref_count);
swap_file = value;
if (swap_file->swap_func == tile_swap_default)
......@@ -151,7 +151,7 @@ tile_swap_exit1 (gpointer key,
def_swap_file = swap_file->user_data;
if (def_swap_file->swap_file_end != 0)
{
g_message (_("swap file not empty: \"%s\"\n"), swap_file->filename);
g_warning ("swap file not empty: \"%s\"\n", swap_file->filename);
tile_swap_print_gaps (def_swap_file);
}
......@@ -332,7 +332,7 @@ tile_swap_command (Tile *tile,
swap_file = g_hash_table_lookup (swap_files, &tile->swap_num);
if (!swap_file)
{
g_message (_("could not find swap file for tile"));
g_warning ("could not find swap file for tile");
goto out;
}
......@@ -418,7 +418,7 @@ tile_swap_default (int fd,
tile_swap_default_delete (def_swap_file, fd, tile);
break;
case SWAP_COMPRESS:
g_message (_("tile_swap_default: SWAP_COMPRESS: UNFINISHED"));
g_warning ("tile_swap_default: SWAP_COMPRESS: UNFINISHED");
break;
}
......
......@@ -187,12 +187,12 @@ tile_destroy (Tile *tile)
{
if (tile->ref_count)
{
g_warning (_("tried to destroy a ref'd tile"));
g_warning ("tried to destroy a ref'd tile");
return;
}
if (tile->share_count)
{
g_warning (_("tried to destroy an attached tile"));
g_warning ("tried to destroy an attached tile");
return;
}
if (tile->data)
......@@ -308,7 +308,7 @@ tile_detach (Tile *tile, void *tm, int tile_num)
if (*link == NULL)
{
g_warning (_("Tried to detach a nonattached tile"));
g_warning ("Tried to detach a nonattached tile");
return;
}
......
......@@ -40,6 +40,7 @@
#include "interface.h"
#include "errorconsole.h"
#include "errors.h"
#include "libgimp/gimpintl.h"
extern char *prog_name;
......@@ -72,11 +73,9 @@ fatal_error (char *fmt, ...)
va_start (args, fmt);
#ifndef NATIVE_WIN32
printf ("%s fatal error: ", prog_name);
vprintf (fmt, args);
printf ("\n");
printf (_("%s: fatal error: %s\n"), prog_name, g_strdup_vprintf (fmt, args));
#else
g_error ("%s: %s\n", prog_name, g_strdup_vprintf (fmt, args));
g_error (_("%s: fatal error: %s\n"), prog_name, g_strdup_vprintf (fmt, args));
#endif
va_end (args);
......
......@@ -914,7 +914,7 @@ layers_dialog_update (GimpImage* gimage)
layer_widget_delete (lw);
}
if (layersD->layer_widgets)
g_message (_("layersD->layer_widgets not empty!"));
g_warning ("layersD->layer_widgets not empty!");
layersD->layer_widgets = NULL;
/* Find the preview extents */
......
......@@ -366,7 +366,7 @@ menus_set_sensitive (char *path,
gtk_widget_set_sensitive (widget, sensitive);
}
if (!ifactory || !widget)
g_message (_("Unable to set sensitivity for menu which doesn't exist:\n%s"), path);
g_warning ("Unable to set sensitivity for menu which doesn't exist:\n%s", path);
}
void
......@@ -391,7 +391,7 @@ menus_set_state (char *path,
widget = NULL;
}
if (!ifactory || !widget)
g_message (_("Unable to set state for menu which doesn't exist:\n%s\n"), path);
g_warning ("Unable to set state for menu which doesn't exist:\n%s\n", path);
}
void
......
......@@ -610,7 +610,7 @@ palette_entries_load (char *filename)
if (!(fp = fopen (filename, "rb")))
{
palette_entries_free (entries);
g_warning (_("failed to open palette file %s: can't happen?"), filename);
g_warning ("failed to open palette file %s: can't happen?", filename);
return;
}
......
......@@ -252,7 +252,7 @@ pattern_change_callbacks(PatternSelectP psp, gint closing)
PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != PDB_SUCCESS)
g_message (_("failed to run pattern callback function"));
g_warning ("failed to run pattern callback function");
procedural_db_destroy_args (return_vals, nreturn_vals);
}
......
......@@ -1321,18 +1321,18 @@ plug_in_handle_message (WireMessage *msg)
plug_in_handle_quit ();
break;
case GP_CONFIG:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_REQ:
plug_in_handle_tile_req (msg->data);
break;
case GP_TILE_ACK:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_DATA:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_PROC_RUN:
......@@ -1343,7 +1343,7 @@ plug_in_handle_message (WireMessage *msg)
plug_in_close (current_plug_in, FALSE);
break;
case GP_TEMP_PROC_RUN:
g_message (_("plug_in_handle_message(): received a temp proc run message (should not happen)"));
g_warning ("plug_in_handle_message(): received a temp proc run message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TEMP_PROC_RETURN:
......@@ -1397,21 +1397,21 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writechannel, &tile_data))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (!wire_read_msg (current_readchannel, &msg))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_DATA)
{
g_message (_("expected tile data and received: %d"), msg.type);
g_warning ("expected tile data and received: %d", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1425,7 +1425,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_message (_("plug-in requested invalid drawable (killing)"));
g_warning ("plug-in requested invalid drawable (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1433,7 +1433,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_info->tile_num, TRUE, TRUE);
if (!tile)
{
g_message (_("plug-in requested invalid tile (killing)"));
g_warning ("plug-in requested invalid tile (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1448,7 +1448,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
wire_destroy (&msg);
if (!gp_tile_ack_write (current_writechannel))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1462,7 +1462,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_message (_("plug-in requested invalid drawable (killing)"));
g_warning ("plug-in requested invalid drawable (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1470,7 +1470,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_req->tile_num, TRUE, FALSE);
if (!tile)
{
g_message (_("plug-in requested invalid tile (killing)"));
g_warning ("plug-in requested invalid tile (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1490,7 +1490,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writechannel, &tile_data))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1499,14 +1499,14 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!wire_read_msg (current_readchannel, &msg))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_ACK)
{
g_message (_("expected tile ack and received: %d"), msg.type);
g_warning ("expected tile ack and received: %d", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1530,7 +1530,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_message (_("PDB lookup failed on %s"), proc_run->name);
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
}
......@@ -1554,7 +1554,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!gp_proc_return_write (current_writechannel, &proc_return))
{
g_message (_("plug_in_handle_proc_run: ERROR"));
g_warning ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1598,7 +1598,7 @@ plug_in_handle_proc_return (GPProcReturn *proc_return)
plug_in_push (blocked->plug_in);
if (!gp_proc_return_write (current_writechannel, proc_return))
{
g_message (_("plug_in_handle_proc_run: ERROR"));
g_message ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -2315,7 +2315,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_message (_("Uh-oh, no active gdisplay for the plug-in!"));
g_warning ("Uh-oh, no active gdisplay for the plug-in!");
g_free (args);
return;
}
......@@ -2338,7 +2338,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_message (_("Uh-oh, no active gdisplay for the temporary procedure!"));
g_warning ("Uh-oh, no active gdisplay for the temporary procedure!");
g_free (args);
return;
}
......
......@@ -1321,18 +1321,18 @@ plug_in_handle_message (WireMessage *msg)
plug_in_handle_quit ();
break;
case GP_CONFIG:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_REQ:
plug_in_handle_tile_req (msg->data);
break;
case GP_TILE_ACK:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_DATA:
g_message (_("plug_in_handle_message(): received a config message (should not happen)"));
g_warning ("plug_in_handle_message(): received a config message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_PROC_RUN:
......@@ -1343,7 +1343,7 @@ plug_in_handle_message (WireMessage *msg)
plug_in_close (current_plug_in, FALSE);
break;
case GP_TEMP_PROC_RUN:
g_message (_("plug_in_handle_message(): received a temp proc run message (should not happen)"));
g_warning ("plug_in_handle_message(): received a temp proc run message (should not happen)");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TEMP_PROC_RETURN:
......@@ -1397,21 +1397,21 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writechannel, &tile_data))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (!wire_read_msg (current_readchannel, &msg))
{
g_message (_("plug_in_handle_tile_req: ERROR"));
g_warning ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_DATA)
{
g_message (_("expected tile data and received: %d"), msg.type);
g_warning ("expected tile data and received: %d", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1425,7 +1425,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_message (_("plug-in requested invalid drawable (killing)"));
g_warning ("plug-in requested invalid drawable (killing)");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1433,7 +1433,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_info->tile_num, TRUE, TRUE);
if (!tile)