various minor i18n fixes and a patch from Wolfgang Hofer

--Sven

ChangeLog

@@ -1,3 +1,26 @@
+Wed Mar  8 14:50:57 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* plug-ins/common/align_layers.c
+	* plug-ins/common/illusion.c
+	* plug-ins/common/mblur.c
+	* plug-ins/common/papertile.c
+	* plug-ins/common/polar.c
+	* plug-ins/common/sample_colorize.c
+	* plug-ins/common/scatter_hsv.c
+	* plug-ins/common/screenshot.c
+	* plug-ins/common/sharpen.c
+	* plug-ins/common/vpropagate.c
+	* plug-ins/common/wind.c
+	* plug-ins/common/wmf.c
+	* plug-ins/gap/gap_navigator_dialog.c
+	* plug-ins/gimpressionist/gimp.c: dont mark PDB help strings for
+	translation, various other small fixes
+
+	* plug-ins/xjt/xjt.c
+	* plug-ins/xjt/xpdb_calls.c
+	* plug-ins/xjt/xpdb_calls.h: 
+	applied patch provided by Wolfgang Hofer <hof@hotbot.com> 
+
 Wed Mar  8 12:40:53 GMT 2000  Adam D. Moss <adam@gimp.org>
 
 	* plug-ins/common/xbm.c: Type of written array should

plug-ins/common/align_layers.c

@@ -146,8 +146,8 @@ query (void)
   INIT_I18N();
   
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Align visible layers"),
+			  "Align visible layers",
-			  _("Align visible layers"),
+			  "Align visible layers",
 			  "Shuji Narazaki <narazaki@InetQ.or.jp>",
 			  "Shuji Narazaki",
 			  "1997",

plug-ins/common/illusion.c

@@ -107,8 +107,8 @@ query (void)
   INIT_I18N();
 
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("produce illusion"),
+			  "produce illusion",
-			  _("produce illusion"),
+			  "produce illusion",
 			  "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			  "Hirotsuna Mizuno",
 			  PLUG_IN_VERSION,

plug-ins/common/mblur.c

@@ -162,10 +162,11 @@ query (void)
   INIT_I18N();
 
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Motion blur of image"),
+			  "Motion blur of image",
-			  _("This plug-in simulates the effect seen when photographing a moving object at a slow shutter speed. Done by adding multiple displaced copies."),
+			  "This plug-in simulates the effect seen when photographing a moving object "
+			  "at a slow shutter speed. Done by adding multiple displaced copies.",
 			  "Torsten Martinsen, Federico Mena Quintero and Daniel Skarda",
-			  "Torsten Martinsen, Federico Mena Quintero and Daniel Skarda",			       
+			  "Torsten Martinsen, Federico Mena Quintero and Daniel Skarda",       
 			  PLUG_IN_VERSION,
 			  N_("<Image>/Filters/Blur/Motion Blur..."),
 			  "RGB*, GRAY*",

plug-ins/common/papertile.c

@@ -863,8 +863,8 @@ plugin_query (void)
   INIT_I18N ();
 
   gimp_install_procedure (PLUGIN_PROCEDURE_NAME,
-			  _("Cuts an image into paper tiles, and slides each paper tile."),
+			  "Cuts an image into paper tiles, and slides each paper tile.",
-			  _("This plug-in cuts an image into paper tiles and slides each paper tile."),
+			  "This plug-in cuts an image into paper tiles and slides each paper tile.",
 			  "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			  "Copyright (c)1997-1999 Hirotsuna Mizuno",
 			  _("September 31, 1999"),

plug-ins/common/polar.c

@@ -207,8 +207,9 @@ query (void)
   INIT_I18N();
 
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Converts and image to and from polar coords"),
+			  "Converts and image to and from polar coords",
-			  _("Remaps and image from rectangular coordinates to polar coordinats or vice versa"),
+			  "Remaps and image from rectangular coordinates to polar coordinates "
+			  "or vice versa",
 			  "Daniel Dunbar and Federico Mena Quintero",
 			  "Daniel Dunbar and Federico Mena Quintero",
 			  PLUG_IN_VERSION,

plug-ins/common/sample_colorize.c

@@ -299,7 +299,7 @@ query (void)
 
   INIT_I18N();
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Colorize the contents of the specified drawable similar to sample drawable"),
+			  "Colorize the contents of the specified drawable similar to sample drawable",
 			  help_string,
 			  "Wolfgang Hofer",
 			  "hof@hotbot.com",

plug-ins/common/scatter_hsv.c

@@ -136,8 +136,8 @@ query (void)
   INIT_I18N();
   
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Scattering pixel values in HSV space"),
+			  "Scattering pixel values in HSV space",
-			  _("Scattering pixel values in HSV space"),
+			  "Scattering pixel values in HSV space",
 			  "Shuji Narazaki (narazaki@InetQ.or.jp)",
 			  "Shuji Narazaki",
 			  "1997",

plug-ins/common/screenshot.c

@@ -132,14 +132,14 @@ static void query (void)
 
   /* the actual installation of the plugin */
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Creates a screenshot of a single window or the whole screen"),
+			  "Creates a screenshot of a single window or the whole screen",
-			  _("This extension serves as a simple frontend to the X-window "
+			  "This extension serves as a simple frontend to the X-window "
-			    "utility xwd and the xwd-file-plug-in. After specifying some " 
+			  "utility xwd and the xwd-file-plug-in. After specifying some " 
-			    "options, xwd is called, the user selects a window, and the "
+			  "options, xwd is called, the user selects a window, and the "
-			    "resulting image is loaded into the gimp. Alternatively the "
+			  "resulting image is loaded into the gimp. Alternatively the "
-			    "whole screen can be grabbed. When called non-interactively "
+			  "whole screen can be grabbed. When called non-interactively "
-			    "it may grab the root window or use the window-id passed as "
+			  "it may grab the root window or use the window-id passed as "
-			    "a parameter."),
+			  "a parameter.",
 			  "Sven Neumann <sven@gimp.org>",
 			  "1998, 1999",
 			  "v0.9.4 (99/12/28)",

plug-ins/common/sharpen.c

@@ -160,8 +160,8 @@ query (void)
   INIT_I18N();
 
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Sharpen filter, typically used to \'sharpen\' a photographic image."),
+			  "Sharpen filter, typically used to \'sharpen\' a photographic image.",
-			  _("This plug-in selectively performs a convolution filter on an image."),
+			  "This plug-in selectively performs a convolution filter on an image.",
 			  "Michael Sweet <mike@easysw.com>",
 			  "Copyright 1997-1998 by Michael Sweet",
 			  PLUG_IN_VERSION,

plug-ins/common/vpropagate.c

@@ -210,8 +210,8 @@ query (void)
   INIT_I18N();
   
   gimp_install_procedure (PLUG_IN_NAME,
-			  _("Propagate values of the layer"),
+			  "Propagate values of the layer",
-			  _("Propagate values of the layer"),
+			  "Propagate values of the layer",
 			  "Shuji Narazaki (narazaki@InetQ.or.jp)",
 			  "Shuji Narazaki",
 			  "1996-1997",
@@ -362,7 +362,7 @@ value_propagate_body (gint drawable_id)
 
   best = (guchar *) malloc (bytes);
 
-  gimp_progress_init ( _("value propagating..."));
+  gimp_progress_init ( _("Value propagating..."));
   gimp_palette_get_foreground (fore+0, fore+1, fore+2);
 
   /* start real job */

plug-ins/common/wind.c

@@ -84,8 +84,7 @@ static gint render_blast_row (guchar *buffer, gint bytes, gint lpi,
 static void render_wind_row  (guchar *sb, gint bytes, gint lpi, gint threshold,
 			      gint strength, edge_t edge);
 
-static void msg_ok_callback                 (GtkWidget *widget, gpointer data);
+static void ok_callback      (GtkWidget *widget, gpointer data);
-static void ok_callback                     (GtkWidget *widget, gpointer data);
 
 static void get_derivative     (guchar *pixel_R1, guchar *pixel_R2,
 				edge_t edge, gint *derivative_R,
@@ -94,8 +93,6 @@ static gint threshold_exceeded (guchar *pixel_R1, guchar *pixel_R2,
 				edge_t edge, gint threshold);
 static void reverse_buffer     (guchar *buffer, gint length, gint bytes);
 
-static void modal_message_box (gchar *text);
-
 GPlugInInfo PLUG_IN_INFO =
 {
   NULL,	  /* init_proc */
@@ -679,51 +676,15 @@ reverse_buffer (guchar *buffer,
   GUI 
  ***************************************************/
 
-static void
-msg_ok_callback (GtkWidget *widget,
-		 gpointer   data)
-{
-  gtk_grab_remove (GTK_WIDGET (data));
-  gtk_widget_destroy (GTK_WIDGET (data));
-
-  return;
-}
-
-static void
-modal_message_box (gchar *text)
-{
-  GtkWidget *message_box;
-  GtkWidget *label;
-
-  message_box = gimp_dialog_new ( _("Wind"), "wind",
-				 gimp_plugin_help_func, "filters/wind.html",
-				 GTK_WIN_POS_MOUSE,
-				 FALSE, TRUE, FALSE,
-
-				 _("OK"), msg_ok_callback,
-				 NULL, NULL, NULL, TRUE, TRUE,
-
-				 NULL);
-
-  label = gtk_label_new (text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (message_box)->vbox), label,
-		      TRUE, TRUE, 0);
-  gtk_widget_show (label);
-
-  gtk_grab_add (message_box);
-  gtk_widget_show (message_box);
-}
-
 static void
 ok_callback (GtkWidget *widget,
 	     gpointer   data)
 {
   /* we have to stop the dialog from being closed with strength < 1 */
-
+  /* since we use spinbuttons this should never happen ...          */
   if (config.strength < 1)
     {
-      modal_message_box ( _("\n   Wind Strength must be greater than 0.   \n"));
+      g_message (_("Wind Strength must be greater than 0."));
     }
   else
     {

plug-ins/common/wmf.c

@@ -2351,11 +2351,7 @@ load_image (char *filename)
 	  gimp_progress_update (1.0);
 	  
 	  if (canvas->height >= 100)
-	    {
+	    gimp_progress_init (_("Transferring image"));
-	      name_buf = g_strdup_printf (_("Transferring image"));
-	      gimp_progress_init (name_buf);
-	      g_free (name_buf);
-	    }
 	  
 	  image_ID = gimp_image_new (canvas->width, canvas->height, RGB);
 	  gimp_image_set_filename (image_ID, filename);

plug-ins/gap/gap_navigator_dialog.c

@@ -440,7 +440,7 @@ query ()
 
 
   gimp_install_procedure(PLUGIN_NAME,
-			 _("GAP video navigator dialog"),
+			 "GAP video navigator dialog",
 			 "",
 			 "Wolfgang Hofer (hof@hotbot.com)",
 			 "Wolfgang Hofer",

plug-ins/gimpressionist/gimp.c

@@ -97,8 +97,8 @@ query(void)
   INIT_I18N();
 
   gimp_install_procedure(PLUG_IN_NAME,
-			 _("Performs various artistic operations on an image"),
+			 "Performs various artistic operations on an image",
-			 _("Performs various artistic operations on an image"),
+			 "Performs various artistic operations on an image",
 			 "Vidar Madsen <vidar@prosalg.no>",
 			 "Vidar Madsen",
 			 PLUG_IN_VERSION,

plug-ins/xjt/xjt.c

@@ -8,7 +8,7 @@
  *  gzip and bzip2 compression Programs.
  *
  * IMPORTANT NOTE:
- *   This plugin needs GIMP 1.1.16 or newer versions of the GIMP-core to run.
+ *   This plugin needs GIMP 1.1.18 or newer versions of the GIMP-core to run.
  */
  
 /* The GIMP -- an image manipulation program
@@ -35,6 +35,7 @@
  */
 
 /* revision history:
+ * version 1.1.18a; 2000/03/07  hof: tattoo_state
  * version 1.1.16a; 2000/02/04  hof: load paths continued, load tattos, load/save unit
  * version 1.1.15b; 2000/01/28  hof: save/load paths  (load is not activated PDB-bug)
  *                                   continued save/load parasites,
@@ -121,6 +122,7 @@ typedef enum
   PROP_PATHS = 23,
   PROP_USER_UNIT = 24,
 
+  PROP_TATTOO_STATE = 85,
   PROP_PATH_LOCKED = 86,
   PROP_PATH_CURRENT = 87,
   PROP_PATH_TYPE = 88,
@@ -312,6 +314,7 @@ typedef struct
   gfloat            yresolution;
   GimpUnit          unit;
   gint32            tattoo;
+  gint32            tattoo_state;
   gint              n_layers;
   gint              n_channels;
   t_layer_props    *layer_props;
@@ -323,7 +326,7 @@ typedef struct
 } t_image_props;
 
 
-#define PROP_TABLE_ENTRIES 34
+#define PROP_TABLE_ENTRIES 35
 t_prop_table g_prop_table[PROP_TABLE_ENTRIES] = {             
   /* t_proptype              mnemonic   t_paramtyp             default values */
   { PROP_END,                   "*",      PTYP_NOT_SUPPORTED,       0.0,  0.0,  0.0 } ,
@@ -348,6 +351,7 @@ t_prop_table g_prop_table[PROP_TABLE_ENTRIES] = {
   { PROP_RESOLUTION,            "res",    PTYP_2xFLT,              72.0, 72.0,  0.0 } ,
   { PROP_UNIT,                  "unt",    PTYP_INT,                 0.0,  0.0,  0.0 } ,
   { PROP_TATTOO,                "tto",    PTYP_INT,                -1.0,  0.0,  0.0 } ,
+  { PROP_TATTOO_STATE,          "tts",    PTYP_INT,                -1.0,  0.0,  0.0 } ,
   { PROP_PARASITES,             "pte",	  PTYP_INT,		    0.0,  0.0,  0.0 } ,
  
   { PROP_PATH_POINTS,           "php",    PTYP_FLIST,               0.0,  0.0,  0.0 } ,
@@ -468,7 +472,7 @@ query (void)
 			  "loads files of the jpeg-tar file format",
                           "Wolfgang Hofer",
                           "Wolfgang Hofer",
-                          "2000-Feb-04",
+                          "2000-Mar-07",
 			  "<Load>/xjt",
 			  NULL,
                           PROC_PLUG_IN,
@@ -480,7 +484,7 @@ query (void)
 			  "saves files in the jpeg-tar file format",
                           "Wolfgang Hofer",
                           "Wolfgang Hofer",
-                          "2000-Feb-04",
+                          "2000-Mar-07",
                           "<Save>/xjt",
 			  "RGB*, GRAY*",
                           PROC_PLUG_IN,
@@ -744,7 +748,7 @@ p_to_GimpUnit(XJTUnitType intype)
   {
     return((GimpUnit)intype);
   }
-  return (GIMP_UNIT_PIXEL);
+  return(GIMP_UNIT_PIXEL);
 }
 
 XJTUnitType
@@ -1502,7 +1506,7 @@ p_write_image_prp(gchar *dirname, FILE *fp, gint32 image_id, gint wr_all_prp)
  
    fprintf(fp, "%s", GIMP_XJ_IMAGE);
     
-   l_param.string_val = "1.1.16a";
+   l_param.string_val = "1.1.18a";
    p_write_prop (fp, PROP_VERSION, &l_param, wr_all_prp);
 
    l_param.int_val1 = GIMP_MAJOR_VERSION;
@@ -1523,6 +1527,13 @@ p_write_image_prp(gchar *dirname, FILE *fp, gint32 image_id, gint wr_all_prp)
    l_param.int_val1 = p_to_XJTUnitType(gimp_image_get_unit(image_id));
    p_write_prop (fp, PROP_UNIT, &l_param, wr_all_prp);
 
+   /* write tattoo_state */
+   l_param.int_val1 = p_gimp_image_get_tattoo_state(image_id);
+   if(l_param.int_val1 > 0)
+   {
+     p_write_prop (fp, PROP_TATTOO_STATE, &l_param, wr_all_prp);
+   }
+
    /* write guides */
    l_guide_id = p_gimp_image_findnext_guide(image_id, 0);  /* get 1.st guide */
    while(l_guide_id > 0)
@@ -1986,6 +1997,7 @@ t_image_props * p_new_image_prop()
     l_new_prop->yresolution      = g_prop_table[p_get_property_index(PROP_RESOLUTION)].default_val2;
     l_new_prop->unit             = p_to_GimpUnit(g_prop_table[p_get_property_index(PROP_UNIT)].default_val1);
     l_new_prop->tattoo           = g_prop_table[p_get_property_index(PROP_TATTOO)].default_val1;
+    l_new_prop->tattoo_state     = g_prop_table[p_get_property_index(PROP_TATTOO_STATE)].default_val1;
     l_new_prop->n_layers = 0;
     l_new_prop->n_channels = 0;
     l_new_prop->layer_props = NULL;
@@ -2849,6 +2861,9 @@ gint p_scann_image_prop(gchar* scan_ptr, t_image_props *image_prop)
        case PROP_TATTOO:
             image_prop->tattoo = l_param.int_val1;
             break;
+       case PROP_TATTOO_STATE:
+            image_prop->tattoo_state = l_param.int_val1;
+            break;
        default :
             /* fprintf(stderr, "XJT: Warning PRP unexpected token in line:\n%s\n", scan_ptr); */
             /* return -1; */ /* skip unknow tokens */
@@ -3574,6 +3589,12 @@ load_xjt_image (gchar *filename)
       p_add_paths(l_image_id,  l_image_prp_ptr->path_props);
    }
 
+   /* set tattoo_state */
+   if(l_image_prp_ptr->tattoo_state > 0)
+   {
+     p_gimp_image_set_tattoo_state(l_image_id, l_image_prp_ptr->tattoo_state);
+   }
+
 cleanup:
 
    if(l_layers_list) g_free (l_layers_list);

plug-ins/xjt/xpdb_calls.c

@@ -22,6 +22,7 @@
  */
 
 /* revision history:
+ * version 1.1.18a; 2000/03/07  hof: tattoo_state
  * version 1.1.16a; 2000/02/04  hof: path lockedstaus, tattoo set procedures
  * version 1.1.15b; 2000/01/28  hof: parasites
  *                                   removed old gimp 1.0.x PDB Interfaces
@@ -946,3 +947,64 @@ p_gimp_channel_set_tattoo(gint32 channel_id, gint32 tattoovalue)
    return(-1);
 }	/* end p_gimp_channel_set_tattoo */
 
+
+/* ============================================================================
+ * p_gimp_image_set_tattoo_state
+ *   
+ * ============================================================================
+ */
+
+gint
+p_gimp_image_set_tattoo_state(gint32 image_id, gint32 tattoo_state)
+{
+   static gchar    *l_called_proc = "gimp_image_set_tattoo_state";
+   GParam          *return_vals;
+   int              nreturn_vals;
+
+   if(p_procedure_available(l_called_proc) < 0)
+   {
+     return(-1);
+   }
+   return_vals = gimp_run_procedure (l_called_proc,
+                                 &nreturn_vals,
+                                 PARAM_IMAGE, image_id,
+                                 PARAM_INT32, tattoo_state,
+                                 PARAM_END);
+
+   if (return_vals[0].data.d_status == STATUS_SUCCESS)
+   {
+      return(0); /* OK */
+   }
+   printf("XJT: Error: PDB call of %s failed\n", l_called_proc);
+   return(-1);
+}	/* end p_gimp_image_set_tattoo_state */
+
+/* ============================================================================
+ * p_gimp_image_get_tattoo_state
+ *   
+ * ============================================================================
+ */
+
+gint32
+p_gimp_image_get_tattoo_state(gint32 image_id)
+{
+   static gchar    *l_called_proc = "gimp_image_get_tattoo_state";
+   GParam          *return_vals;
+   int              nreturn_vals;
+
+   if(p_procedure_available(l_called_proc) < 0)
+   {
+     return(-1);
+   }
+   return_vals = gimp_run_procedure (l_called_proc,
+                                 &nreturn_vals,
+                                 PARAM_IMAGE, image_id,
+                                 PARAM_END);
+
+   if (return_vals[0].data.d_status == STATUS_SUCCESS)
+   {
+      return(return_vals[1].data.d_int32); /* OK */
+   }
+   printf("XJT: Error: PDB call of %s failed\n", l_called_proc);
+   return(-1);
+}	/* end p_gimp_image_get_tattoo_state */

plug-ins/xjt/xpdb_calls.h

@@ -20,6 +20,7 @@
  */
 
 /* revision history:
+ * version 1.1.18a; 2000/03/07  hof: tattoo_state
  * version 1.1.16a; 2000/02/04  hof: path lockedstaus, tattoo set procedures
  * version 1.1.15b; 2000/01/28  hof: parasites part2
  * version 1.1.15;  2000/01/20  hof: parasites
@@ -72,6 +73,7 @@ gint32   p_gimp_path_get_tattoo(gint32 image_id, gchar *name);
 gint     p_gimp_path_set_tattoo(gint32 image_id, gchar *name, gint32 tattoovalue);
 gint     p_gimp_layer_set_tattoo(gint32 layer_id, gint32 tattoovalue);
 gint     p_gimp_channel_set_tattoo(gint32 channel_id, gint32 tattoovalue);
-
+gint     p_gimp_image_set_tattoo_state(gint32 image_id, gint32 tattoo_state);
+gint32   p_gimp_image_get_tattoo_state(gint32 image_id);
 
 #endif

po-plug-ins/ChangeLog

@@ -1,3 +1,9 @@
+Wed Mar  8 14:47:50 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* de.po: updated german translation
+	
+	* it.po: applied patch provided by Daniele Medri <madrid@linux.it>
+
 Mon Mar  6 22:36:29 CET 2000  Stanislav Brabec  <utx@penguin.cz>
 
 	* cs.po: Updated translation.