diff --git a/ChangeLog b/ChangeLog index 2a55c365ff..29da85a289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Sat Nov 20 02:46:12 MET 1999 Sven Neumann + + * common/colortoalpha.c + * common/film.c + * common/grid.c + * common/mapcolor.c + * common/nova.c + * common/papertile.c + * common/rotate.c + * ifscompose/ifscompose.c + * sinus/sinus.c: internationalization fixes + (hopefully got it right now) + Sat Nov 20 01:59:10 MET 1999 Sven Neumann * libgimp/gimpcolorbutton.c: include config.h to enable NLS @@ -19,6 +32,7 @@ Sat Nov 20 00:27:26 GMT 1999 Andy Thomas between this behaviour and the "original" way of having one nav dialog per display. +>>>>>>> 1.1829 Sat Nov 20 01:27:12 MET 1999 Sven Neumann * convolve.c diff --git a/plug-ins/common/colortoalpha.c b/plug-ins/common/colortoalpha.c index 659d3c0fba..ab21178920 100644 --- a/plug-ins/common/colortoalpha.c +++ b/plug-ins/common/colortoalpha.c @@ -21,6 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include #include #include "gtk/gtk.h" @@ -95,22 +96,22 @@ query () { static GParamDef args[] = { - { PARAM_INT32, "run_mode", "Interactive, non-interactive" }, - { PARAM_IMAGE, "image", "Input image (unused)" }, + { PARAM_INT32, "run_mode", "Interactive, non-interactive" }, + { PARAM_IMAGE, "image", "Input image (unused)" }, { PARAM_DRAWABLE, "drawable", "Input drawable" }, - { PARAM_COLOR, "color", "Color to remove"}, + { PARAM_COLOR, "color", "Color to remove"}, }; static GParamDef *return_vals = NULL; static int nargs = sizeof (args) / sizeof (args[0]); static int nreturn_vals = 0; gimp_install_procedure ("plug_in_colortoalpha", - "Convert the color in an image to alpha", - "This replaces as much of a given color as possible in each pixel with a corresponding amount of alpha, then readjusts the color accordingly.", + _("Convert the color in an image to alpha"), + _("This replaces as much of a given color as possible in each pixel with a corresponding amount of alpha, then readjusts the color accordingly."), "Seth Burgess", "Seth Burgess ", - "7th Aug 1999", - "/Filters/Colors/Color To Alpha", + _("7th Aug 1999"), + _("/Filters/Colors/Color To Alpha"), "RGBA", PROC_PLUG_IN, nargs, nreturn_vals, diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index 20b81bc084..8fe53deafa 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -226,7 +226,7 @@ query () "Peter Kirchgessner", "Peter Kirchgessner (peter@kirchgessner.net)", "1997", - N_("/Filters/Combine/Film"), + _("/Filters/Combine/Film"), "INDEXED*, GRAY*, RGB*", PROC_PLUG_IN, nargs, nreturn_vals, diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 203ad5b608..51f7ba7f3f 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -27,6 +27,7 @@ * For more info see libgimp/gimpsizeentry.h */ +#include "config.h" #include #include #include "gtk/gtk.h" @@ -119,12 +120,12 @@ void query (void) static int nreturn_vals = 0; gimp_install_procedure ("plug_in_grid", - "Draws a grid.", - "", + _("Draws a grid."), + _("no help available"), "Tim Newsome", "Tim Newsome, Sven Neumann, Tom Rathborne", "1997, 1999", - "/Filters/Render/Grid", + _("/Filters/Render/Grid"), "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index b3d6c0b0d2..296085b186 100644 --- a/plug-ins/common/mapcolor.c +++ b/plug-ins/common/mapcolor.c @@ -27,6 +27,7 @@ static char dversio[] = "v1.00 26-Oct-98"; static char ident[] = "@(#) GIMP mapcolor plug-in v1.00 26-Oct-98"; +#include "config.h" #include #include #include @@ -131,28 +132,28 @@ query (void) static int nmap_args = sizeof (map_args) / sizeof (map_args[0]); gimp_install_procedure ("plug_in_color_adjust", - "Adjust current foreground/background color in the\ - drawable to black/white", - "The current foreground color is mapped to black, \ -the current background color is mapped to white.", + _("Adjust current foreground/background color in the\ + drawable to black/white"), + _("The current foreground color is mapped to black, \ +the current background color is mapped to white."), "Peter Kirchgessner", "Peter Kirchgessner", dversio, - "/Filters/Colors/Adjust Fgrd.-Bkgrd.", + _("/Filters/Colors/Adjust Fgrd.-Bkgrd."), "RGB*", PROC_PLUG_IN, nadjust_args, 0, adjust_args, NULL); gimp_install_procedure ("plug_in_color_map", - "Map two source colors to two destination colors. \ -Other colors are mapped by interpolation.", - "Map two source colors to two destination colors. \ -Other colors are mapped by interpolation.", + _("Map two source colors to two destination colors. \ +Other colors are mapped by interpolation."), + _("Map two source colors to two destination colors. \ +Other colors are mapped by interpolation."), "Peter Kirchgessner", "Peter Kirchgessner", dversio, - "/Filters/Colors/Color Mapping", + _("/Filters/Colors/Color Mapping"), "RGB*", PROC_PLUG_IN, nmap_args, 0, diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index 6afecd2505..ab7e8dc47d 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -233,19 +233,17 @@ query () static GParamDef *return_vals = NULL; static gint nargs = sizeof (args) / sizeof (args[0]); static gint nreturn_vals = 0; - gchar *help_string = - " This plug-in produces an effect like a supernova burst. The" - " amount of the light effect is approximately in proportion to 1/r," - " where r is the distance from the center of the star. It works with" - " RGB*, GRAY* image."; gimp_install_procedure ("plug_in_nova", - "Produce Supernova effect to the specified drawable", - help_string, + _("Produce Supernova effect to the specified drawable"), + _("This plug-in produces an effect like a supernova burst. The " + "amount of the light effect is approximately in proportion to 1/r, " + "where r is the distance from the center of the star. It works with " + "RGB*, GRAY* image."), "Eiichi Takamori", "Eiichi Takamori", "1997", - "/Filters/Light Effects/SuperNova", + _("/Filters/Light Effects/SuperNova"), "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index 849a15ce8d..792e15f0b8 100644 --- a/plug-ins/common/papertile.c +++ b/plug-ins/common/papertile.c @@ -20,6 +20,7 @@ *============================================================================*/ +#include "config.h" #include #include #include "libgimp/gimp.h" @@ -31,8 +32,6 @@ /*============================================================================*/ #define PLUGIN_PROCEDURE_NAME "plug_in_papertile" -#define PLUGIN_TITLE "Paper Tile" -#define PLUGIN_PATH "/Filters/Map/Paper Tile" /*============================================================================*/ @@ -935,13 +934,12 @@ plugin_query ( void ) gimp_install_procedure ( PLUGIN_PROCEDURE_NAME, - "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.", + _("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 ", "Copyright (c)1997-1999 Hirotsuna Mizuno", - "September 31, 1999", - PLUGIN_PATH, + _("September 31, 1999"), + _("/Filters/Map/Paper Tile"), "RGB*", PROC_PLUG_IN, numof_args, diff --git a/plug-ins/common/rotate.c b/plug-ins/common/rotate.c index 3c0f8e6942..1fce2d01b2 100644 --- a/plug-ins/common/rotate.c +++ b/plug-ins/common/rotate.c @@ -161,7 +161,7 @@ gimp_install_procedure ("plug_in_layer_rot90", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Layers/Rotate/90 degrees"), + _("/Layers/Rotate/90 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, @@ -172,7 +172,7 @@ gimp_install_procedure ("plug_in_layer_rot180", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Layers/Rotate/180 degrees"), + _("/Layers/Rotate/180 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, @@ -183,7 +183,7 @@ gimp_install_procedure ("plug_in_layer_rot270", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Layers/Rotate/270 degrees"), + _("/Layers/Rotate/270 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, @@ -195,7 +195,7 @@ gimp_install_procedure ("plug_in_image_rot90", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Image/Transforms/Rotate/90 degrees"), + _("/Image/Transforms/Rotate/90 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, @@ -206,7 +206,7 @@ gimp_install_procedure ("plug_in_image_rot180", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Image/Transforms/Rotate/180 degrees"), + _("/Image/Transforms/Rotate/180 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, @@ -217,7 +217,7 @@ gimp_install_procedure ("plug_in_image_rot270", PLUG_IN_AUTHOR, PLUG_IN_COPYRIGHT, PLUG_IN_VERSION, - N_("/Image/Transforms/Rotate/270 degrees"), + _("/Image/Transforms/Rotate/270 degrees"), PLUG_IN_IMAGE_TYPES, PROC_PLUG_IN, nmenuargs, nreturn_vals, diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index 4412e78cf2..e5981f3898 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -340,18 +340,18 @@ query () static int nreturn_vals = 0; gimp_install_procedure ("plug_in_ifs_compose", - "Create an Iterated Function System Fractal", - "Interactively create an Iterated Function System fractal." - "Use the window on the upper left to adjust the component" - "transformations of the fractal. The operation that is performed" - "is selected by the buttons underneath the window, or from a" - "menu popped up by the right mouse button. The fractal will be" - "rendered with a transparent background if the current image has" - "a transparent background.", + _("Create an Iterated Function System Fractal"), + _("Interactively create an Iterated Function System fractal." + "Use the window on the upper left to adjust the component" + "transformations of the fractal. The operation that is performed" + "is selected by the buttons underneath the window, or from a" + "menu popped up by the right mouse button. The fractal will be" + "rendered with a transparent background if the current image has" + "a transparent background."), "Owen Taylor", "Owen Taylor", "1997", - "/Filters/Render/IfsCompose", + _("/Filters/Render/IfsCompose"), "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, diff --git a/plug-ins/sinus/sinus.c b/plug-ins/sinus/sinus.c index b4d04d9f15..374e96c65d 100644 --- a/plug-ins/sinus/sinus.c +++ b/plug-ins/sinus/sinus.c @@ -165,12 +165,12 @@ static void query () static gint nreturn_vals = 0; gimp_install_procedure ("plug_in_sinus", - "Generates a texture with sinus functions", + _("Generates a texture with sinus functions"), "FIX ME: sinus help", "Xavier Bouchoux", "Xavier Bouchoux", "1997", - "/Filters/Render/Sinus", + _("/Filters/Render/Sinus"), "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals,