From 2747db5fa177e812e61a2d0396c9e75a21f664cc Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 30 Jan 2000 13:25:54 +0000 Subject: [PATCH] s/colour/color/ --Sven --- ChangeLog | 15 ++++++++++++ modules/colorsel_gtk.c | 2 +- modules/colorsel_triangle.c | 2 +- plug-ins/common/CEL.c | 2 +- plug-ins/common/depthmerge.c | 2 +- plug-ins/common/gif.c | 6 ++--- plug-ins/common/newsprint.c | 4 ++-- plug-ins/common/normalize.c | 2 +- plug-ins/common/semiflatten.c | 7 ++---- plug-ins/common/sunras.c | 44 +++++++++++++++-------------------- plug-ins/common/vinvert.c | 4 ++-- plug-ins/gap/gap_range_ops.c | 20 ++++++++-------- 12 files changed, 58 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d83c7aea6..c7e0b2ef1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Mon Jan 31 12:15:27 CET 2000 Sven Neumann + + * modules/colorsel_gtk.c + * modules/colorsel_triangle.c + * plug-ins/common/CEL.c + * plug-ins/common/depthmerge.c + * plug-ins/common/gif.c + * plug-ins/common/newsprint.c + * plug-ins/common/normalize.c + * plug-ins/common/semiflatten.c + * plug-ins/common/sunras.c + * plug-ins/common/vinvert.c + * plug-ins/gap/gap_range_ops.c: s/colour/color/ + ( The British will probably want to add en_GB po-files? ) + Mon Jan 31 10:59:29 CET 2000 Sven Neumann * plug-ins/gap/gap_exchange_image.c diff --git a/modules/colorsel_gtk.c b/modules/colorsel_gtk.c index 534822b4ad..8bcc8fb0d5 100644 --- a/modules/colorsel_gtk.c +++ b/modules/colorsel_gtk.c @@ -45,7 +45,7 @@ static GimpColorSelectorMethods methods = static GimpModuleInfo info = { NULL, - N_("GTK colour selector as a pluggable colour selector"), + N_("GTK color selector as a pluggable color selector"), "Austin Donnelly ", "v0.02", "(c) 1999, released under the GPL", diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 1fccf51b3c..eb6d2a1535 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -75,7 +75,7 @@ static GimpColorSelectorMethods methods = static GimpModuleInfo info = { NULL, - N_("Painter-style colour selector as a pluggable colour selector"), + N_("Painter-style color selector as a pluggable color selector"), "Simon Budig ", "v0.01", "(c) 1999, released under the GPL", diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c index d0719f81b0..0f448d3f5a 100644 --- a/plug-ins/common/CEL.c +++ b/plug-ins/common/CEL.c @@ -369,7 +369,7 @@ load_image (gchar *file, break; default: - g_message (_("Unsupported number of colours (%d)"), colours); + g_message (_("Unsupported number of colors (%d)"), colours); return -1; } diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index c4d821625a..3c36717508 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -188,7 +188,7 @@ query (void) gimp_install_procedure (PLUG_IN_NAME, _("Combine two images using corresponding " "depth maps (z-buffers)"), - _("Taking as input two full-colour, full-alpha " + _("Taking as input two full-color, full-alpha " "images and two corresponding grayscale depth " "maps, this plug-in combines the images based " "on which is closer (has a lower depth map value) " diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 13d117e70b..e9f563b7e5 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -670,7 +670,7 @@ static int find_unused_ia_colour (guchar *pixels, return ((*colors)-1); } - g_message (_("GIF: Couldn't simply reduce colours further. Saving as opaque.\n")); + g_message (_("GIF: Couldn't simply reduce colors further.\nSaving as opaque.\n")); return (-1); } @@ -1051,8 +1051,8 @@ save_image (gchar *filename, g_warning("Promised %d bpp, pondered writing chunk with %d bpp!", liberalBPP, BitsPerPixel); #endif - g_warning(_("Transparent colour *might* be incorrect on viewers which" - " don't support transparency.")); + g_warning ("Transparent colour *might* be incorrect " + "on viewers which don't support transparency."); } useBPP = (BitsPerPixel > liberalBPP) ? BitsPerPixel : liberalBPP; diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 452b9c261c..6ae8775765 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -538,7 +538,7 @@ query(void) { PARAM_INT32, "cell_width", "screen cell width, in pixels" }, - { PARAM_INT32, "colourspace", "separate to 0:RGB, 1:CMYK, 2:Intensity" }, + { PARAM_INT32, "colorspace", "separate to 0:RGB, 1:CMYK, 2:Intensity" }, { PARAM_INT32, "k_pullout", "Percentage of black to pullout (CMYK only)" }, { PARAM_FLOAT, "gry_ang", "Grey/black screen angle (degrees)" }, @@ -559,7 +559,7 @@ query(void) gimp_install_procedure ("plug_in_newsprint", _("Re-sample the image to give a newspaper-like effect"), - _("Halftone the image, trading off resolution to represent colours or grey levels using the process described both in the PostScript language definition, and also by Robert Ulichney, \"Digital halftoning\", MIT Press, 1987."), + _("Halftone the image, trading off resolution to represent colors or grey levels using the process described both in the PostScript language definition, and also by Robert Ulichney, \"Digital halftoning\", MIT Press, 1987."), "Austin Donnelly", "Austin Donnelly", "1998 (" VERSION ")", diff --git a/plug-ins/common/normalize.c b/plug-ins/common/normalize.c index 21d03712b8..32801b8c32 100644 --- a/plug-ins/common/normalize.c +++ b/plug-ins/common/normalize.c @@ -76,7 +76,7 @@ query () gimp_install_procedure ("plug_in_normalize", _("Normalize the contrast of the specified drawable to cover all possible ranges."), - _("This plugin performs almost the same operation as the 'contrast autostretch' plugin, except that it won't allow the colour channels to normalize independently. This is actually what most people probably want instead of contrast-autostretch; use c-a only if you wish to remove an undesirable colour-tint from a source image which is supposed to contain pure-white and pure-black."), + _("This plugin performs almost the same operation as the 'contrast autostretch' plugin, except that it won't allow the color channels to normalize independently. This is actually what most people probably want instead of contrast-autostretch; use c-a only if you wish to remove an undesirable color-tint from a source image which is supposed to contain pure-white and pure-black."), "Adam D. Moss, Federico Mena Quintero", "Adam D. Moss, Federico Mena Quintero", "1997", diff --git a/plug-ins/common/semiflatten.c b/plug-ins/common/semiflatten.c index 4f1cf4c4b6..3bdd6e2b07 100644 --- a/plug-ins/common/semiflatten.c +++ b/plug-ins/common/semiflatten.c @@ -82,8 +82,8 @@ query () INIT_I18N(); gimp_install_procedure ("plug_in_semiflatten", - _("Flatten pixels in an RGBA image that aren't completely transparent against the current GIMP background colour"), - _("This plugin flattens pixels in an RGBA image that aren't completely transparent against the current GIMP background colour"), + _("Flatten pixels in an RGBA image that aren't completely transparent against the current GIMP background color"), + _("This plugin flattens pixels in an RGBA image that aren't completely transparent against the current GIMP background color"), "Adam D. Moss (adam@foxbox.org)", "Adam D. Moss (adam@foxbox.org)", "27th January 1998", @@ -171,9 +171,6 @@ semiflatten_render_row (const guchar *src_row, } - - - static void semiflatten (GDrawable *drawable) { diff --git a/plug-ins/common/sunras.c b/plug-ins/common/sunras.c index 3d8ec037e8..3d47a1e6de 100644 --- a/plug-ins/common/sunras.c +++ b/plug-ins/common/sunras.c @@ -382,7 +382,7 @@ load_image (gchar *filename) FILE *ifp; char *temp = ident; /* Just to satisfy gcc/lint */ L_SUNFILEHEADER sunhdr; - unsigned char *suncolmap = NULL; + guchar *suncolmap = NULL; ifp = fopen (filename, "rb"); if (!ifp) @@ -411,39 +411,33 @@ load_image (gchar *filename) /* Is there a RGB colourmap ? */ if ((sunhdr.l_ras_maptype == 1) && (sunhdr.l_ras_maplength > 0)) { - suncolmap = (unsigned char *)malloc (sunhdr.l_ras_maplength); - if (suncolmap == NULL) + suncolmap = g_new (guchar, sunhdr.l_ras_maplength); + + read_sun_cols (ifp, &sunhdr, suncolmap); +#ifdef DEBUG + { + int j, ncols; + printf ("File %s\n",filename); + ncols = sunhdr.l_ras_maplength/3; + for (j=0; j < ncols; j++) + printf ("Entry 0x%08x: 0x%04x, 0x%04x, 0x%04x\n", + j,suncolmap[j],suncolmap[j+ncols],suncolmap[j+2*ncols]); + } +#endif + if (sunhdr.l_ras_magic != RAS_MAGIC) { - g_message ("Can't get memory for colour map"); + g_message (_("Can't read color entries")); fclose (ifp); return (-1); } - - read_sun_cols (ifp, &sunhdr, suncolmap); -#ifdef DEBUG - { - int j, ncols; - printf ("File %s\n",filename); - ncols = sunhdr.l_ras_maplength/3; - for (j=0; j < ncols; j++) - printf ("Entry 0x%08x: 0x%04x, 0x%04x, 0x%04x\n", - j,suncolmap[j],suncolmap[j+ncols],suncolmap[j+2*ncols]); - } -#endif - if (sunhdr.l_ras_magic != RAS_MAGIC) - { - g_message ("Can't read colour entries"); - fclose (ifp); - return (-1); - } } else if (sunhdr.l_ras_maplength > 0) { - g_message (_("Type of colourmap not supported")); + g_message (_("Type of colormap not supported")); fseek (ifp, (sizeof (L_SUNFILEHEADER)/sizeof (L_CARD32)) *4 + sunhdr.l_ras_maplength, SEEK_SET); } - + if (l_run_mode != RUN_NONINTERACTIVE) { temp = g_strdup_printf (_("Loading %s:"), filename); @@ -476,7 +470,7 @@ load_image (gchar *filename) fclose (ifp); - if (suncolmap != NULL) free ((char *)suncolmap); + g_free (suncolmap); if (image_ID == -1) { diff --git a/plug-ins/common/vinvert.c b/plug-ins/common/vinvert.c index 68f42ced4f..5101ee58c1 100644 --- a/plug-ins/common/vinvert.c +++ b/plug-ins/common/vinvert.c @@ -80,8 +80,8 @@ query () INIT_I18N(); gimp_install_procedure ("plug_in_vinvert", - _("Invert the 'value' componant of an indexed/RGB image in HSV colourspace"), - _("This function takes an indexed/RGB image and inverts its 'value' in HSV space. The upshot of this is that the colour and saturation at any given point remains the same, but its brightness is effectively inverted. Quite strange. Sometimes produces unpleasant colour artifacts on images from lossy sources (ie. JPEG)."), + _("Invert the 'value' componant of an indexed/RGB image in HSV colorspace"), + _("This function takes an indexed/RGB image and inverts its 'value' in HSV space. The upshot of this is that the color and saturation at any given point remains the same, but its brightness is effectively inverted. Quite strange. Sometimes produces unpleasant color artifacts on images from lossy sources (ie. JPEG)."), "Adam D. Moss (adam@foxbox.org)", "Adam D. Moss (adam@foxbox.org)", "27th March 1997", diff --git a/plug-ins/gap/gap_range_ops.c b/plug-ins/gap/gap_range_ops.c index f7e771302a..154d29aad7 100644 --- a/plug-ins/gap/gap_range_ops.c +++ b/plug-ins/gap/gap_range_ops.c @@ -292,15 +292,15 @@ p_convert_indexed_dialog(gint32 *dest_colors, gint32 *dest_dither, { #define ARGC_INDEXED 6 static t_arr_arg argv[ARGC_INDEXED]; - static char *radio_paltype[4] = { N_("Generate optimal palette") - , N_("WEB palette") - , N_("Use custom palette") - , N_("Use black/white (1-bit) palette") + static char *radio_paltype[4] = { N_("Generate Optimal Palette") + , N_("WEB Palette") + , N_("Use Custom Palette") + , N_("Use Black/White (1-Bit) Palette") }; - static char *radio_dither[4] = { N_("Floyd-Steinberg colour dithering (normal)") - , N_("Floyd-Steinberg colour dithering (reduced colour bleeding)") - , N_("Positioned colour dithering") - , N_("No colour dithering") + static char *radio_dither[4] = { N_("Floyd-Steinberg Color Dithering (Normal)") + , N_("Floyd-Steinberg Color Dithering (Reduced Color Bleeding)") + , N_("Positioned Color Dithering") + , N_("No Color Dithering") }; static int gettextize_loop = 0; @@ -319,12 +319,12 @@ p_convert_indexed_dialog(gint32 *dest_colors, gint32 *dest_dither, p_init_arr_arg(&argv[1], WGT_TEXT); argv[1].label_txt = _("Custom Palette"); - argv[1].help_txt = _("name of a cutom palette\n(is ignored if Palette Type is not custom)"); + argv[1].help_txt = _("Name of a cutom palette\n(is ignored if Palette Type is not custom)"); argv[1].text_buf_len = len_palette; argv[1].text_buf_ret = palette; p_init_arr_arg(&argv[2], WGT_TOGGLE); - argv[2].label_txt = _("Remove unused"); + argv[2].label_txt = _("Remove Unused"); argv[2].help_txt = _("Remove unused or double colors\n(is ignored if Palette Type is not custom)"); argv[2].int_ret = 1;