dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in removed tips files, AC_SUBST GIMP_PLUGINS and GIMP_MODULES so 

* configure.in
* Makefile.am: removed tips files, AC_SUBST GIMP_PLUGINS and
GIMP_MODULES so you can easily skip those parts of the build

* acinclude.m4
* config.sub
* config.guess
* ltconfig
* ltmain.sh: libtool 1.3.2

* app/fileops.c: shuffle #includes to avoid warning about MIN and
MAX

[ The following is a big i18n patch from David Monniaux
  <david.monniaux@ens.fr> ]

* tips/gimp_conseils.fr.txt
* tips/gimp_tips.txt
* tips/Makefile.am
* configure.in: moved tips to separate dir

* po-plugins: new dir for plug-in translation files

* configure.in: add po-plugins dir and POTFILES processing

* app/boundary.c
* app/brightness_contrast.c
* app/by_color_select.c
* app/color_balance.c
* app/convert.c
* app/curves.c
* app/free_select.c
* app/gdisplay.c
* app/gimpimage.c
* app/gimpunit.c
* app/gradient.c
* app/gradient_select.c
* app/install.c
* app/session.c: various i18n tweaks

* app/tips_dialog.c: localize tips filename

* libgimp/gimpunit.c
* libgimp/gimpunitmenu.c: #include "config.h"

* plug-ins/CEL
* plug-ins/CML_explorer
* plug-ins/Lighting
* plug-ins/apply_lens
* plug-ins/autostretch_hsv
* plug-ins/blur
* plug-ins/bmp
* plug-ins/borderaverage
* plug-ins/bumpmap
* plug-ins/bz2
* plug-ins/checkerboard
* plug-ins/colorify
* plug-ins/compose
* plug-ins/convmatrix
* plug-ins/cubism
* plug-ins/depthmerge
* plug-ins/destripe
* plug-ins/gif
* plug-ins/gifload
* plug-ins/jpeg
* plug-ins/mail
* plug-ins/oilify
* plug-ins/png
* plug-ins/print
* plug-ins/ps
* plug-ins/xbm
* plug-ins/xpm
* plug-ins/xwd: plug-in i18n stuff

-Yosh
This commit is contained in:
Manish Singh 1999-05-29 16:35:47 +00:00
parent 392b7d1496
commit f2622e5420
175 changed files with 33250 additions and 2136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ChangeLog
View File

@ -1,3 +1,79 @@
Sat May 29 09:28:40 PDT 1999 Manish Singh <yosh@gimp.org>
* configure.in
* Makefile.am: removed tips files, AC_SUBST GIMP_PLUGINS and
GIMP_MODULES so you can easily skip those parts of the build
* acinclude.m4
* config.sub
* config.guess
* ltconfig
* ltmain.sh: libtool 1.3.2
* app/fileops.c: shuffle #includes to avoid warning about MIN and
MAX
[ The following is a big i18n patch from David Monniaux
<david.monniaux@ens.fr> ]
* tips/gimp_conseils.fr.txt
* tips/gimp_tips.txt
* tips/Makefile.am
* configure.in: moved tips to separate dir
* po-plugins: new dir for plug-in translation files
* configure.in: add po-plugins dir and POTFILES processing
* app/boundary.c
* app/brightness_contrast.c
* app/by_color_select.c
* app/color_balance.c
* app/convert.c
* app/curves.c
* app/free_select.c
* app/gdisplay.c
* app/gimpimage.c
* app/gimpunit.c
* app/gradient.c
* app/gradient_select.c
* app/install.c
* app/session.c: various i18n tweaks
* app/tips_dialog.c: localize tips filename
* libgimp/gimpunit.c
* libgimp/gimpunitmenu.c: #include "config.h"
* plug-ins/CEL
* plug-ins/CML_explorer
* plug-ins/Lighting
* plug-ins/apply_lens
* plug-ins/autostretch_hsv
* plug-ins/blur
* plug-ins/bmp
* plug-ins/borderaverage
* plug-ins/bumpmap
* plug-ins/bz2
* plug-ins/checkerboard
* plug-ins/colorify
* plug-ins/compose
* plug-ins/convmatrix
* plug-ins/cubism
* plug-ins/depthmerge
* plug-ins/destripe
* plug-ins/gif
* plug-ins/gifload
* plug-ins/jpeg
* plug-ins/mail
* plug-ins/oilify
* plug-ins/png
* plug-ins/print
* plug-ins/ps
* plug-ins/xbm
* plug-ins/xpm
* plug-ins/xwd: plug-in i18n stuff
1999-05-29 Tuomas Kuosmanen <tigert@gimp.org>
* gimp1_1_splash.ppm: New splash - enjoy while it lasts..

4
Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = tools po intl libgimp app plug-ins modules data @GIMPDOCS@
SUBDIRS = tools po po-plug-ins intl libgimp app $(GIMP_PLUGINS) $(GIMP_MODULES) data tips $(GIMPDOCS)
bin_SCRIPTS = gimptool
@ -67,7 +67,6 @@ EXTRA_DIST = \
rmshm \
user_install \
user_install.bat \
gimp_tips.txt \
ps-menurc \
gimp.1 \
gimptool.1 \
@ -84,7 +83,6 @@ gimpdata_DATA = \
gimp_logo.ppm \
gimp_splash.ppm \
gimp1_1_splash.ppm \
gimp_tips.txt \
ps-menurc \
gtkrc.forest2

9
acinclude.m4
View File

@ -21,7 +21,7 @@
## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program.
# serial 39 AC_PROG_LIBTOOL
# serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@ -382,6 +382,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@ -405,9 +406,11 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
INCLTDL=
fi
])
@ -420,5 +423,5 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
dnl This is just to quiet aclocal about the macro not being used
ifelse(a,b,[AC_DISABLE_FAST_INSTALL])dnl
dnl This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])dnl

6
app/base/boundary.c
View File

@ -202,7 +202,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs);
if (!tmp_segs)
fatal_error (_("Unable to reallocate segments array for mask boundary."));
fatal_error ("Unable to reallocate segments array for mask boundary.");
}
tmp_segs[num_segs].x1 = x1;
@ -244,7 +244,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c)
fatal_error (_("Unable to reallocate empty segments array for mask boundary."));
fatal_error ("Unable to reallocate empty segments array for mask boundary.");
}
}
@ -499,7 +499,7 @@ sort_boundary (BoundSeg *segs,
}
if (x != startx || y != starty)
g_message (_("sort_boundary(): Unconnected boundary group!"));
g_message ("sort_boundary(): Unconnected boundary group!");
/* Mark the end of a group */
*num_groups = *num_groups + 1;

2
app/base/color-balance.c
View File

@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map"));
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd);

2
app/base/curves.c
View File

@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_message (_("curves_preview(): No image map"));
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */

6
app/boundary.c
View File

@ -202,7 +202,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs);
if (!tmp_segs)
fatal_error (_("Unable to reallocate segments array for mask boundary."));
fatal_error ("Unable to reallocate segments array for mask boundary.");
}
tmp_segs[num_segs].x1 = x1;
@ -244,7 +244,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c)
fatal_error (_("Unable to reallocate empty segments array for mask boundary."));
fatal_error ("Unable to reallocate empty segments array for mask boundary.");
}
}
@ -499,7 +499,7 @@ sort_boundary (BoundSeg *segs,
}
if (x != startx || y != starty)
g_message (_("sort_boundary(): Unconnected boundary group!"));
g_message ("sort_boundary(): Unconnected boundary group!");
/* Mark the end of a group */
*num_groups = *num_groups + 1;

2
app/brightness_contrast.c
View File

@ -416,7 +416,7 @@ static void
brightness_contrast_preview (BrightnessContrastDialog *bcd)
{
if (!bcd->image_map)
g_message (_("brightness_contrast_preview(): No image map"));
g_message ("brightness_contrast_preview(): No image map");
active_tool->preserve = TRUE;
brightness_contrast_lut_setup(bcd->lut, bcd->brightness / 255.0,
bcd->contrast / 127.0,

3
app/by_color_select.c
View File

@ -634,7 +634,8 @@ by_color_select_new_dialog ()
/* the radio buttons */
for (i = 0; i < (sizeof(button_names) / sizeof(button_names[0])); 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",

2
app/color_balance.c
View File

@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map"));
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd);

4
app/convert.c
View File

@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
goto got_colour;
}
}
g_error (_("Non-existant colour was expected to "
"be in non-destructive colourmap."));
g_error ("Non-existant colour was expected to "
"be in non-destructive colourmap.");
got_colour:
dest[INDEXED_PIX] = lastindex;
if (has_alpha)

4
app/core/gimpimage-convert.c
View File

@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
goto got_colour;
}
}
g_error (_("Non-existant colour was expected to "
"be in non-destructive colourmap."));
g_error ("Non-existant colour was expected to "
"be in non-destructive colourmap.");
got_colour:
dest[INDEXED_PIX] = lastindex;
if (has_alpha)

2
app/core/gimpimage-guides.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpimage-merge.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpimage-projection.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpimage-resize.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpimage-scale.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpimage.c
View File

@ -1028,7 +1028,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);
}

2
app/core/gimpprojection-construct.c
View File

@ -1028,7 +1028,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);
}

6
app/core/gimpprojection.c
View File

@ -216,7 +216,7 @@ gdisplay_format_title (GDisplay *gdisp,
format++;
switch (*format) {
case 0:
g_warning (_("image-title-format string ended within %%-sequence"));
g_warning ("image-title-format string ended within %%-sequence");
break;
case '%':
@ -264,7 +264,7 @@ gdisplay_format_title (GDisplay *gdisp,
*/
default:
g_warning (_("image-title-format contains unknown format sequence '%%%c'"), *format);
g_warning ("image-title-format contains unknown format sequence '%%%c'", *format);
break;
}
break;
@ -538,7 +538,7 @@ gdisplay_idlerender_init (GDisplay *gdisp)
{
if (gdisp->idle_render.update_areas == NULL)
{
g_warning (_("Wanted to start idlerender thread with no update_areas. (+memleak)"));
g_warning ("Wanted to start idlerender thread with no update_areas. (+memleak)");
return;
}

1
app/core/gimpunit.c
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>

2
app/curves.c
View File

@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_message (_("curves_preview(): No image map"));
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */

10
app/dialogs/tips-dialog.c
View File

@ -13,7 +13,7 @@
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h"
#define TIPS_FILE_NAME "gimp_tips.txt"
#define TIPS_DIR_NAME "tips"
static int tips_dialog_hide (GtkWidget *widget, gpointer data);
static int tips_show_next (GtkWidget *widget, gpointer data);
@ -51,8 +51,10 @@ tips_dialog_create ()
if (tips_count == 0)
{
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
gimp_data_directory (), TIPS_FILE_NAME);
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S TIPS_DIR_NAME
G_DIR_SEPARATOR_S "%s",
gimp_data_directory (),
_("gimp_tips.txt"));
read_tips_file (temp);
g_free (temp);
}
@ -252,7 +254,7 @@ read_tips_file (char *filename)
if (!fp)
{
store_tip (_("Your GIMP tips file appears to be missing!\n"
"There should be a file called " TIPS_FILE_NAME " in the\n"
"There should be a file called gimp_tips.txt in the\n"
"GIMP data directory. Please check your installation."));
return;
}

172
app/dialogs/user-install-dialog.c
View File

@ -122,127 +122,127 @@ install_help (InstallCallback callback)
{ 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") },
{ 0, "\n" },
{ 0, N_("This program is free software; you can redistribute it and/or modify\n") },
{ 0, N_("it under the terms of the GNU General Public License as published by\n") },
{ 0, N_("the Free Software Foundation; either version 2 of the License, or\n") },
{ 0, N_("(at your option) any later version.\n") },
{ 0, N_(
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n") },
{ 0, "\n" },
{ 0, N_("This program is distributed in the hope that it will be useful,\n") },
{ 0, N_("but WITHOUT ANY WARRANTY; without even the implied warranty of\n") },
{ 0, N_("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n") },
{ 0, N_("See the GNU General Public License for more details.\n") },
{ 0, N_(
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n") },
{ 0, "\n" },
{ 0, N_("You should have received a copy of the GNU General Public License\n") },
{ 0, N_("along with this program; if not, write to the Free Software\n") },
{ 0, N_("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n") },
{ 0, N_(
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA.\n") },
{ 0, "\n\n" },
{ 2, N_("Personal GIMP Installation\n\n") },
{ 0, N_("For a proper GIMP installation, a subdirectory called\n") },
{ 1, NULL }, /* will be replaced with gimp_directory() */
{ 0, N_(" needs to be created. This\n") },
{ 0, N_("subdirectory will contain a number of important files:\n\n") },
{ 0, N_(" needs to be created. This\n"
"subdirectory will contain a number of important files:\n\n") },
{ 1, N_("gimprc\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n") },
{ 0, N_("\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n") },
{ 0, N_("\t\tPaths to search for brushes, palettes, gradients\n") },
{ 0, N_("\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n"
"\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n"
"\t\tPaths to search for brushes, palettes, gradients\n"
"\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 1, N_("unitrc\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n") },
{ 0, N_("\t\tYou can define additional units and use them just\n") },
{ 0, N_("\t\tlike you use the built-in units inches, millimeters,\n") },
{ 0, N_("\t\tpoints and picas. This file is overwritten each time\n") },
{ 0, N_("\t\tyou quit the GIMP.\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n"
"\t\tYou can define additional units and use them just\n"
"\t\tlike you use the built-in units inches, millimeters,\n"
"\t\tpoints and picas. This file is overwritten each time\n"
"\t\tyou quit the GIMP.\n") },
{ 1, N_("pluginrc\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n") },
{ 0, N_("\t\tthe GIMP which provide additional functionality.\n") },
{ 0, N_("\t\tThese programs are searched for at run-time and\n") },
{ 0, N_("\t\tinformation about their functionality and mod-times\n") },
{ 0, N_("\t\tis cached in this file. This file is intended to\n") },
{ 0, N_("\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n"
"\t\tthe GIMP which provide additional functionality.\n"
"\t\tThese programs are searched for at run-time and\n"
"\t\tinformation about their functionality and mod-times\n"
"\t\tis cached in this file. This file is intended to\n"
"\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 1, N_("brushes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined brushes. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp brushes installation when searching for\n") },
{ 0, N_("\t\tbrushes.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined brushes. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp brushes installation when searching for\n"
"\t\tbrushes.\n") },
{ 1, N_("gradients\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gradients. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp gradients installation when searching for\n") },
{ 0, N_("\t\tgradients.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n\t\tuser defined gradients. The default gimprc file\n\t\tchecks this subdirectory in addition to the system-\n\t\twide gimp gradients installation when searching for\n\t\tgradients.\n") },
{ 1, N_("gfig\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined figures to be used by the gfig plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gfig installation\n") },
{ 0, N_("\t\twhen searching for gfig figures.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined figures to be used by the gfig plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gfig installation\n"
"\t\twhen searching for gfig figures.\n") },
{ 1, N_("gflares\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gflares to be used by the gflare plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gflares installation\n") },
{ 0, N_("\t\twhen searching for gflares.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined gflares to be used by the gflare plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gflares installation\n"
"\t\twhen searching for gflares.\n") },
{ 1, N_("fractalexplorer\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp FractalExplorer installation\n") },
{ 0, N_("\t\twhen searching for fractals.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp FractalExplorer installation\n"
"\t\twhen searching for fractals.\n") },
{ 1, N_("palettes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined palettes. The default gimprc file\n") },
{ 0, N_("\t\tchecks only this subdirectory (not the system-wide\n") },
{ 0, N_("\t\tinstallation) when searching for palettes. During\n") },
{ 0, N_("\t\tinstallation, the system palettes will be copied\n") },
{ 0, N_("\t\there. This is done to allow modifications made to\n") },
{ 0, N_("\t\tpalettes during GIMP execution to persist across\n") },
{ 0, N_("\t\tsessions.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined palettes. The default gimprc file\n"
"\t\tchecks only this subdirectory (not the system-wide\n"
"\t\tinstallation) when searching for palettes. During\n"
"\t\tinstallation, the system palettes will be copied\n"
"\t\there. This is done to allow modifications made to\n"
"\t\tpalettes during GIMP execution to persist across\n"
"\t\tsessions.\n") },
{ 1, N_("patterns\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined patterns. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp patterns installation when searching for\n") },
{ 0, N_("\t\tpatterns.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined patterns. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp patterns installation when searching for\n"
"\t\tpatterns.\n") },
{ 1, N_("plug-ins\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser created, temporary, or otherwise non-system-\n") },
{ 0, N_("\t\tsupported plug-ins. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide GIMP plug-in directories when searching for\n") },
{ 0, N_("\t\tplug-ins.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser created, temporary, or otherwise non-system-\n"
"\t\tsupported plug-ins. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide GIMP plug-in directories when searching for\n"
"\t\tplug-ins.\n") },
{ 1, N_("modules\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n") },
{ 0, N_("\t\ttemporary, or otherwise non-system-supported DLL modules.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory\n") },
{ 0, N_("\t\tin addition to the system-wide GIMP module directory\n") },
{ 0, N_("\t\twhen searching for modules to load when initialising.\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n"
"\t\ttemporary, or otherwise non-system-supported DLL modules.\n"
"\t\tThe default gimprc file checks this subdirectory\n"
"\t\tin addition to the system-wide GIMP module directory\n"
"\t\twhen searching for modules to load when initialising.\n") },
{ 1, N_("scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n") },
{ 0, N_("\t\tuser created and installed scripts. The default gimprc\n") },
{ 0, N_("\t\tfile checks this subdirectory in addition to the system\n") },
{ 0, N_("\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n"
"\t\tuser created and installed scripts. The default gimprc\n"
"\t\tfile checks this subdirectory in addition to the system\n"
"\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 1, N_("tmp\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n") },
{ 0, N_("\t\tstore undo buffers to reduce memory usage. If GIMP is\n") },
{ 0, N_("\t\tunceremoniously killed, files may persist in this directory\n") },
{ 0, N_("\t\tof the form: gimp<#>.<#>. These files are useless across\n") },
{ 0, N_("\t\tGIMP sessions and can be destroyed with impunity.\n") }
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n"
"\t\tstore undo buffers to reduce memory usage. If GIMP is\n"
"\t\tunceremoniously killed, files may persist in this directory\n"
"\t\tof the form: gimp<#>.<#>. These files are useless across\n"
"\t\tGIMP sessions and can be destroyed with impunity.\n") }
};
gint nhelp_lines = sizeof (help_lines) / sizeof (help_lines[0]);
gint i;

6
app/display/gimpdisplay.c
View File

@ -216,7 +216,7 @@ gdisplay_format_title (GDisplay *gdisp,
format++;
switch (*format) {
case 0:
g_warning (_("image-title-format string ended within %%-sequence"));
g_warning ("image-title-format string ended within %%-sequence");
break;
case '%':
@ -264,7 +264,7 @@ gdisplay_format_title (GDisplay *gdisp,
*/
default:
g_warning (_("image-title-format contains unknown format sequence '%%%c'"), *format);
g_warning ("image-title-format contains unknown format sequence '%%%c'", *format);
break;
}
break;
@ -538,7 +538,7 @@ gdisplay_idlerender_init (GDisplay *gdisp)
{
if (gdisp->idle_render.update_areas == NULL)
{
g_warning (_("Wanted to start idlerender thread with no update_areas. (+memleak)"));
g_warning ("Wanted to start idlerender thread with no update_areas. (+memleak)");
return;
}

7
app/fileops.c
View File

@ -19,6 +19,10 @@
#include "config.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include <glib.h>
#include <ctype.h>
@ -26,9 +30,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
app/free_select.c
View File

@ -72,7 +72,7 @@ add_point (int num_pts, int x, int y)
global_pts = (GdkPoint *) g_realloc ((void *) global_pts, sizeof (GdkPoint) * max_segs);
if (!global_pts)
fatal_error (_("Unable to reallocate points array in free_select."));
fatal_error ("Unable to reallocate points array in free_select.");
}
global_pts[num_pts].x = x;

6
app/gdisplay.c
View File

@ -216,7 +216,7 @@ gdisplay_format_title (GDisplay *gdisp,
format++;
switch (*format) {
case 0:
g_warning (_("image-title-format string ended within %%-sequence"));
g_warning ("image-title-format string ended within %%-sequence");
break;
case '%':
@ -264,7 +264,7 @@ gdisplay_format_title (GDisplay *gdisp,
*/
default:
g_warning (_("image-title-format contains unknown format sequence '%%%c'"), *format);
g_warning ("image-title-format contains unknown format sequence '%%%c'", *format);
break;
}
break;
@ -538,7 +538,7 @@ gdisplay_idlerender_init (GDisplay *gdisp)
{
if (gdisp->idle_render.update_areas == NULL)
{
g_warning (_("Wanted to start idlerender thread with no update_areas. (+memleak)"));
g_warning ("Wanted to start idlerender thread with no update_areas. (+memleak)");
return;
}

4
app/gimpimage-convert.c
View File

@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
goto got_colour;
}
}
g_error (_("Non-existant colour was expected to "
"be in non-destructive colourmap."));
g_error ("Non-existant colour was expected to "
"be in non-destructive colourmap.");
got_colour:
dest[INDEXED_PIX] = lastindex;
if (has_alpha)

2
app/gimpimage.c
View File

@ -1028,7 +1028,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);
}

1
app/gimpunit.c
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>

12
app/gradient.c
View File

@ -2256,8 +2256,8 @@ control_do_hint(gint x, gint y)
break;
default:
g_message (_("control_do_hint: oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_do_hint: oops, in_handle is true "
"yet we got handle type %d", (int) handle);
break;
} /* switch */
} else
@ -2360,8 +2360,8 @@ control_button_press(gint x, gint y, guint button, guint state)
return;
default:
g_message (_("control_button_press(): oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_button_press(): oops, in_handle is true "
"yet we got handle type %d", (int) handle);
return;
} /* switch */
else {
@ -2404,7 +2404,7 @@ control_point_in_handle(gint x, gint y, grad_segment_t *seg, control_drag_mode_t
break;
default:
g_message (_("control_point_in_handle(): oops, can not handle drag mode %d"),
g_message ("control_point_in_handle(): oops, can not handle drag mode %d",
(int) handle);
return 0;
} /* switch */
@ -2498,7 +2498,7 @@ control_motion(gint x)
break;
default:
fatal_error(_("control_motion(): aieee, attempt to move bogus handle %d"),
fatal_error("control_motion(): aieee, attempt to move bogus handle %d",
(int) g_editor->control_drag_mode);
break;
} /* switch */

12
app/gradient_editor.c
View File

@ -2256,8 +2256,8 @@ control_do_hint(gint x, gint y)
break;
default:
g_message (_("control_do_hint: oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_do_hint: oops, in_handle is true "
"yet we got handle type %d", (int) handle);
break;
} /* switch */
} else
@ -2360,8 +2360,8 @@ control_button_press(gint x, gint y, guint button, guint state)
return;
default:
g_message (_("control_button_press(): oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_button_press(): oops, in_handle is true "
"yet we got handle type %d", (int) handle);
return;
} /* switch */
else {
@ -2404,7 +2404,7 @@ control_point_in_handle(gint x, gint y, grad_segment_t *seg, control_drag_mode_t
break;
default:
g_message (_("control_point_in_handle(): oops, can not handle drag mode %d"),
g_message ("control_point_in_handle(): oops, can not handle drag mode %d",
(int) handle);
return 0;
} /* switch */
@ -2498,7 +2498,7 @@ control_motion(gint x)
break;
default:
fatal_error(_("control_motion(): aieee, attempt to move bogus handle %d"),
fatal_error("control_motion(): aieee, attempt to move bogus handle %d",
(int) g_editor->control_drag_mode);
break;
} /* switch */

2
app/gradient_select.c
View File

@ -390,7 +390,7 @@ grad_change_callbacks(GradSelectP gsp, gint closing)
PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != PDB_SUCCESS)
g_message (_("failed to run gradient callback function"));
g_message ("failed to run gradient callback function");
else
procedural_db_destroy_args (return_vals, nreturn_vals);
}

12
app/gui/gradient-editor.c
View File

@ -2256,8 +2256,8 @@ control_do_hint(gint x, gint y)
break;
default:
g_message (_("control_do_hint: oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_do_hint: oops, in_handle is true "
"yet we got handle type %d", (int) handle);
break;
} /* switch */
} else
@ -2360,8 +2360,8 @@ control_button_press(gint x, gint y, guint button, guint state)
return;
default:
g_message (_("control_button_press(): oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_button_press(): oops, in_handle is true "
"yet we got handle type %d", (int) handle);
return;
} /* switch */
else {
@ -2404,7 +2404,7 @@ control_point_in_handle(gint x, gint y, grad_segment_t *seg, control_drag_mode_t
break;
default:
g_message (_("control_point_in_handle(): oops, can not handle drag mode %d"),
g_message ("control_point_in_handle(): oops, can not handle drag mode %d",
(int) handle);
return 0;
} /* switch */
@ -2498,7 +2498,7 @@ control_motion(gint x)
break;
default:
fatal_error(_("control_motion(): aieee, attempt to move bogus handle %d"),
fatal_error("control_motion(): aieee, attempt to move bogus handle %d",
(int) g_editor->control_drag_mode);
break;
} /* switch */

2
app/gui/gradient-select.c
View File

@ -390,7 +390,7 @@ grad_change_callbacks(GradSelectP gsp, gint closing)
PDB_END);
if (!return_vals || return_vals[0].value.pdb_int != PDB_SUCCESS)
g_message (_("failed to run gradient callback function"));
g_message ("failed to run gradient callback function");
else
procedural_db_destroy_args (return_vals, nreturn_vals);
}

14
app/gui/session.c
View File

@ -136,13 +136,13 @@ save_sessionrc (void)
if (!fp)
return;
fprintf(fp, _("# GIMP sessionrc\n"));
fprintf(fp, _("# This file takes session-specific info (that is info,\n"));
fprintf(fp, _("# you want to keep between two gimp-sessions). You are\n"));
fprintf(fp, _("# not supposed to edit it manually, but of course you\n"));
fprintf(fp, _("# can do. This file will be entirely rewritten every time\n"));
fprintf(fp, _("# you quit the gimp. If this file isn't found, defaults\n"));
fprintf(fp, _("# are used.\n\n"));
fprintf(fp, _("# GIMP sessionrc\n"
"# This file takes session-specific info (that is info,\n"
"# you want to keep between two gimp-sessions). You are\n"
"# not supposed to edit it manually, but of course you\n"
"# can do. This file will be entirely rewritten every time\n"
"# you quit the gimp. If this file isn't found, defaults\n"
"# are used.\n\n"));
/* save window geometries */
g_list_foreach (session_info_updates, (GFunc)sessionrc_write_info, fp);

10
app/gui/tips-dialog.c
View File

@ -13,7 +13,7 @@
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h"
#define TIPS_FILE_NAME "gimp_tips.txt"
#define TIPS_DIR_NAME "tips"
static int tips_dialog_hide (GtkWidget *widget, gpointer data);
static int tips_show_next (GtkWidget *widget, gpointer data);
@ -51,8 +51,10 @@ tips_dialog_create ()
if (tips_count == 0)
{
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
gimp_data_directory (), TIPS_FILE_NAME);
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S TIPS_DIR_NAME
G_DIR_SEPARATOR_S "%s",
gimp_data_directory (),
_("gimp_tips.txt"));
read_tips_file (temp);
g_free (temp);
}
@ -252,7 +254,7 @@ read_tips_file (char *filename)
if (!fp)
{
store_tip (_("Your GIMP tips file appears to be missing!\n"
"There should be a file called " TIPS_FILE_NAME " in the\n"
"There should be a file called gimp_tips.txt in the\n"
"GIMP data directory. Please check your installation."));
return;
}

172
app/gui/user-install-dialog.c
View File

@ -122,127 +122,127 @@ install_help (InstallCallback callback)
{ 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") },
{ 0, "\n" },
{ 0, N_("This program is free software; you can redistribute it and/or modify\n") },
{ 0, N_("it under the terms of the GNU General Public License as published by\n") },
{ 0, N_("the Free Software Foundation; either version 2 of the License, or\n") },
{ 0, N_("(at your option) any later version.\n") },
{ 0, N_(
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n") },
{ 0, "\n" },
{ 0, N_("This program is distributed in the hope that it will be useful,\n") },
{ 0, N_("but WITHOUT ANY WARRANTY; without even the implied warranty of\n") },
{ 0, N_("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n") },
{ 0, N_("See the GNU General Public License for more details.\n") },
{ 0, N_(
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n") },
{ 0, "\n" },
{ 0, N_("You should have received a copy of the GNU General Public License\n") },
{ 0, N_("along with this program; if not, write to the Free Software\n") },
{ 0, N_("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n") },
{ 0, N_(
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA.\n") },
{ 0, "\n\n" },
{ 2, N_("Personal GIMP Installation\n\n") },
{ 0, N_("For a proper GIMP installation, a subdirectory called\n") },
{ 1, NULL }, /* will be replaced with gimp_directory() */
{ 0, N_(" needs to be created. This\n") },
{ 0, N_("subdirectory will contain a number of important files:\n\n") },
{ 0, N_(" needs to be created. This\n"
"subdirectory will contain a number of important files:\n\n") },
{ 1, N_("gimprc\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n") },
{ 0, N_("\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n") },
{ 0, N_("\t\tPaths to search for brushes, palettes, gradients\n") },
{ 0, N_("\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n"
"\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n"
"\t\tPaths to search for brushes, palettes, gradients\n"
"\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 1, N_("unitrc\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n") },
{ 0, N_("\t\tYou can define additional units and use them just\n") },
{ 0, N_("\t\tlike you use the built-in units inches, millimeters,\n") },
{ 0, N_("\t\tpoints and picas. This file is overwritten each time\n") },
{ 0, N_("\t\tyou quit the GIMP.\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n"
"\t\tYou can define additional units and use them just\n"
"\t\tlike you use the built-in units inches, millimeters,\n"
"\t\tpoints and picas. This file is overwritten each time\n"
"\t\tyou quit the GIMP.\n") },
{ 1, N_("pluginrc\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n") },
{ 0, N_("\t\tthe GIMP which provide additional functionality.\n") },
{ 0, N_("\t\tThese programs are searched for at run-time and\n") },
{ 0, N_("\t\tinformation about their functionality and mod-times\n") },
{ 0, N_("\t\tis cached in this file. This file is intended to\n") },
{ 0, N_("\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n"
"\t\tthe GIMP which provide additional functionality.\n"
"\t\tThese programs are searched for at run-time and\n"
"\t\tinformation about their functionality and mod-times\n"
"\t\tis cached in this file. This file is intended to\n"
"\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 1, N_("brushes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined brushes. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp brushes installation when searching for\n") },
{ 0, N_("\t\tbrushes.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined brushes. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp brushes installation when searching for\n"
"\t\tbrushes.\n") },
{ 1, N_("gradients\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gradients. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp gradients installation when searching for\n") },
{ 0, N_("\t\tgradients.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n\t\tuser defined gradients. The default gimprc file\n\t\tchecks this subdirectory in addition to the system-\n\t\twide gimp gradients installation when searching for\n\t\tgradients.\n") },
{ 1, N_("gfig\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined figures to be used by the gfig plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gfig installation\n") },
{ 0, N_("\t\twhen searching for gfig figures.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined figures to be used by the gfig plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gfig installation\n"
"\t\twhen searching for gfig figures.\n") },
{ 1, N_("gflares\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gflares to be used by the gflare plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gflares installation\n") },
{ 0, N_("\t\twhen searching for gflares.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined gflares to be used by the gflare plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gflares installation\n"
"\t\twhen searching for gflares.\n") },
{ 1, N_("fractalexplorer\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp FractalExplorer installation\n") },
{ 0, N_("\t\twhen searching for fractals.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp FractalExplorer installation\n"
"\t\twhen searching for fractals.\n") },
{ 1, N_("palettes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined palettes. The default gimprc file\n") },
{ 0, N_("\t\tchecks only this subdirectory (not the system-wide\n") },
{ 0, N_("\t\tinstallation) when searching for palettes. During\n") },
{ 0, N_("\t\tinstallation, the system palettes will be copied\n") },
{ 0, N_("\t\there. This is done to allow modifications made to\n") },
{ 0, N_("\t\tpalettes during GIMP execution to persist across\n") },
{ 0, N_("\t\tsessions.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined palettes. The default gimprc file\n"
"\t\tchecks only this subdirectory (not the system-wide\n"
"\t\tinstallation) when searching for palettes. During\n"
"\t\tinstallation, the system palettes will be copied\n"
"\t\there. This is done to allow modifications made to\n"
"\t\tpalettes during GIMP execution to persist across\n"
"\t\tsessions.\n") },
{ 1, N_("patterns\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined patterns. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp patterns installation when searching for\n") },
{ 0, N_("\t\tpatterns.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined patterns. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp patterns installation when searching for\n"
"\t\tpatterns.\n") },
{ 1, N_("plug-ins\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser created, temporary, or otherwise non-system-\n") },
{ 0, N_("\t\tsupported plug-ins. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide GIMP plug-in directories when searching for\n") },
{ 0, N_("\t\tplug-ins.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser created, temporary, or otherwise non-system-\n"
"\t\tsupported plug-ins. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide GIMP plug-in directories when searching for\n"
"\t\tplug-ins.\n") },
{ 1, N_("modules\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n") },
{ 0, N_("\t\ttemporary, or otherwise non-system-supported DLL modules.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory\n") },
{ 0, N_("\t\tin addition to the system-wide GIMP module directory\n") },
{ 0, N_("\t\twhen searching for modules to load when initialising.\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n"
"\t\ttemporary, or otherwise non-system-supported DLL modules.\n"
"\t\tThe default gimprc file checks this subdirectory\n"
"\t\tin addition to the system-wide GIMP module directory\n"
"\t\twhen searching for modules to load when initialising.\n") },
{ 1, N_("scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n") },
{ 0, N_("\t\tuser created and installed scripts. The default gimprc\n") },
{ 0, N_("\t\tfile checks this subdirectory in addition to the system\n") },
{ 0, N_("\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n"
"\t\tuser created and installed scripts. The default gimprc\n"
"\t\tfile checks this subdirectory in addition to the system\n"
"\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 1, N_("tmp\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n") },
{ 0, N_("\t\tstore undo buffers to reduce memory usage. If GIMP is\n") },
{ 0, N_("\t\tunceremoniously killed, files may persist in this directory\n") },
{ 0, N_("\t\tof the form: gimp<#>.<#>. These files are useless across\n") },
{ 0, N_("\t\tGIMP sessions and can be destroyed with impunity.\n") }
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n"
"\t\tstore undo buffers to reduce memory usage. If GIMP is\n"
"\t\tunceremoniously killed, files may persist in this directory\n"
"\t\tof the form: gimp<#>.<#>. These files are useless across\n"
"\t\tGIMP sessions and can be destroyed with impunity.\n") }
};
gint nhelp_lines = sizeof (help_lines) / sizeof (help_lines[0]);
gint i;

172
app/install.c
View File

@ -122,127 +122,127 @@ install_help (InstallCallback callback)
{ 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") },
{ 0, "\n" },
{ 0, N_("This program is free software; you can redistribute it and/or modify\n") },
{ 0, N_("it under the terms of the GNU General Public License as published by\n") },
{ 0, N_("the Free Software Foundation; either version 2 of the License, or\n") },
{ 0, N_("(at your option) any later version.\n") },
{ 0, N_(
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n") },
{ 0, "\n" },
{ 0, N_("This program is distributed in the hope that it will be useful,\n") },
{ 0, N_("but WITHOUT ANY WARRANTY; without even the implied warranty of\n") },
{ 0, N_("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n") },
{ 0, N_("See the GNU General Public License for more details.\n") },
{ 0, N_(
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n") },
{ 0, "\n" },
{ 0, N_("You should have received a copy of the GNU General Public License\n") },
{ 0, N_("along with this program; if not, write to the Free Software\n") },
{ 0, N_("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n") },
{ 0, N_(
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA.\n") },
{ 0, "\n\n" },
{ 2, N_("Personal GIMP Installation\n\n") },
{ 0, N_("For a proper GIMP installation, a subdirectory called\n") },
{ 1, NULL }, /* will be replaced with gimp_directory() */
{ 0, N_(" needs to be created. This\n") },
{ 0, N_("subdirectory will contain a number of important files:\n\n") },
{ 0, N_(" needs to be created. This\n"
"subdirectory will contain a number of important files:\n\n") },
{ 1, N_("gimprc\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n") },
{ 0, N_("\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n") },
{ 0, N_("\t\tPaths to search for brushes, palettes, gradients\n") },
{ 0, N_("\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n"
"\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n"
"\t\tPaths to search for brushes, palettes, gradients\n"
"\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 1, N_("unitrc\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n") },
{ 0, N_("\t\tYou can define additional units and use them just\n") },
{ 0, N_("\t\tlike you use the built-in units inches, millimeters,\n") },
{ 0, N_("\t\tpoints and picas. This file is overwritten each time\n") },
{ 0, N_("\t\tyou quit the GIMP.\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n"
"\t\tYou can define additional units and use them just\n"
"\t\tlike you use the built-in units inches, millimeters,\n"
"\t\tpoints and picas. This file is overwritten each time\n"
"\t\tyou quit the GIMP.\n") },
{ 1, N_("pluginrc\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n") },
{ 0, N_("\t\tthe GIMP which provide additional functionality.\n") },
{ 0, N_("\t\tThese programs are searched for at run-time and\n") },
{ 0, N_("\t\tinformation about their functionality and mod-times\n") },
{ 0, N_("\t\tis cached in this file. This file is intended to\n") },
{ 0, N_("\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n"
"\t\tthe GIMP which provide additional functionality.\n"
"\t\tThese programs are searched for at run-time and\n"
"\t\tinformation about their functionality and mod-times\n"
"\t\tis cached in this file. This file is intended to\n"
"\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 1, N_("brushes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined brushes. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp brushes installation when searching for\n") },
{ 0, N_("\t\tbrushes.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined brushes. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp brushes installation when searching for\n"
"\t\tbrushes.\n") },
{ 1, N_("gradients\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gradients. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp gradients installation when searching for\n") },
{ 0, N_("\t\tgradients.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n\t\tuser defined gradients. The default gimprc file\n\t\tchecks this subdirectory in addition to the system-\n\t\twide gimp gradients installation when searching for\n\t\tgradients.\n") },
{ 1, N_("gfig\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined figures to be used by the gfig plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gfig installation\n") },
{ 0, N_("\t\twhen searching for gfig figures.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined figures to be used by the gfig plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gfig installation\n"
"\t\twhen searching for gfig figures.\n") },
{ 1, N_("gflares\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gflares to be used by the gflare plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gflares installation\n") },
{ 0, N_("\t\twhen searching for gflares.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined gflares to be used by the gflare plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gflares installation\n"
"\t\twhen searching for gflares.\n") },
{ 1, N_("fractalexplorer\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp FractalExplorer installation\n") },
{ 0, N_("\t\twhen searching for fractals.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp FractalExplorer installation\n"
"\t\twhen searching for fractals.\n") },
{ 1, N_("palettes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined palettes. The default gimprc file\n") },
{ 0, N_("\t\tchecks only this subdirectory (not the system-wide\n") },
{ 0, N_("\t\tinstallation) when searching for palettes. During\n") },
{ 0, N_("\t\tinstallation, the system palettes will be copied\n") },
{ 0, N_("\t\there. This is done to allow modifications made to\n") },
{ 0, N_("\t\tpalettes during GIMP execution to persist across\n") },
{ 0, N_("\t\tsessions.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined palettes. The default gimprc file\n"
"\t\tchecks only this subdirectory (not the system-wide\n"
"\t\tinstallation) when searching for palettes. During\n"
"\t\tinstallation, the system palettes will be copied\n"
"\t\there. This is done to allow modifications made to\n"
"\t\tpalettes during GIMP execution to persist across\n"
"\t\tsessions.\n") },
{ 1, N_("patterns\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined patterns. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp patterns installation when searching for\n") },
{ 0, N_("\t\tpatterns.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined patterns. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp patterns installation when searching for\n"
"\t\tpatterns.\n") },
{ 1, N_("plug-ins\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser created, temporary, or otherwise non-system-\n") },
{ 0, N_("\t\tsupported plug-ins. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide GIMP plug-in directories when searching for\n") },
{ 0, N_("\t\tplug-ins.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser created, temporary, or otherwise non-system-\n"
"\t\tsupported plug-ins. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide GIMP plug-in directories when searching for\n"
"\t\tplug-ins.\n") },
{ 1, N_("modules\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n") },
{ 0, N_("\t\ttemporary, or otherwise non-system-supported DLL modules.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory\n") },
{ 0, N_("\t\tin addition to the system-wide GIMP module directory\n") },
{ 0, N_("\t\twhen searching for modules to load when initialising.\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n"
"\t\ttemporary, or otherwise non-system-supported DLL modules.\n"
"\t\tThe default gimprc file checks this subdirectory\n"
"\t\tin addition to the system-wide GIMP module directory\n"
"\t\twhen searching for modules to load when initialising.\n") },
{ 1, N_("scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n") },
{ 0, N_("\t\tuser created and installed scripts. The default gimprc\n") },
{ 0, N_("\t\tfile checks this subdirectory in addition to the system\n") },
{ 0, N_("\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n"
"\t\tuser created and installed scripts. The default gimprc\n"
"\t\tfile checks this subdirectory in addition to the system\n"
"\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 1, N_("tmp\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n") },
{ 0, N_("\t\tstore undo buffers to reduce memory usage. If GIMP is\n") },
{ 0, N_("\t\tunceremoniously killed, files may persist in this directory\n") },
{ 0, N_("\t\tof the form: gimp<#>.<#>. These files are useless across\n") },
{ 0, N_("\t\tGIMP sessions and can be destroyed with impunity.\n") }
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n"
"\t\tstore undo buffers to reduce memory usage. If GIMP is\n"
"\t\tunceremoniously killed, files may persist in this directory\n"
"\t\tof the form: gimp<#>.<#>. These files are useless across\n"
"\t\tGIMP sessions and can be destroyed with impunity.\n") }
};
gint nhelp_lines = sizeof (help_lines) / sizeof (help_lines[0]);
gint i;

14
app/session.c
View File

@ -136,13 +136,13 @@ save_sessionrc (void)
if (!fp)
return;
fprintf(fp, _("# GIMP sessionrc\n"));
fprintf(fp, _("# This file takes session-specific info (that is info,\n"));
fprintf(fp, _("# you want to keep between two gimp-sessions). You are\n"));
fprintf(fp, _("# not supposed to edit it manually, but of course you\n"));
fprintf(fp, _("# can do. This file will be entirely rewritten every time\n"));
fprintf(fp, _("# you quit the gimp. If this file isn't found, defaults\n"));
fprintf(fp, _("# are used.\n\n"));
fprintf(fp, _("# GIMP sessionrc\n"
"# This file takes session-specific info (that is info,\n"
"# you want to keep between two gimp-sessions). You are\n"
"# not supposed to edit it manually, but of course you\n"
"# can do. This file will be entirely rewritten every time\n"
"# you quit the gimp. If this file isn't found, defaults\n"
"# are used.\n\n"));
/* save window geometries */
g_list_foreach (session_info_updates, (GFunc)sessionrc_write_info, fp);

10
app/tips_dialog.c
View File

@ -13,7 +13,7 @@
#include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.h"
#define TIPS_FILE_NAME "gimp_tips.txt"
#define TIPS_DIR_NAME "tips"
static int tips_dialog_hide (GtkWidget *widget, gpointer data);
static int tips_show_next (GtkWidget *widget, gpointer data);
@ -51,8 +51,10 @@ tips_dialog_create ()
if (tips_count == 0)
{
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
gimp_data_directory (), TIPS_FILE_NAME);
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S TIPS_DIR_NAME
G_DIR_SEPARATOR_S "%s",
gimp_data_directory (),
_("gimp_tips.txt"));
read_tips_file (temp);
g_free (temp);
}
@ -252,7 +254,7 @@ read_tips_file (char *filename)
if (!fp)
{
store_tip (_("Your GIMP tips file appears to be missing!\n"
"There should be a file called " TIPS_FILE_NAME " in the\n"
"There should be a file called gimp_tips.txt in the\n"
"GIMP data directory. Please check your installation."));
return;
}

2
app/tools/brightness_contrast.c
View File

@ -416,7 +416,7 @@ static void
brightness_contrast_preview (BrightnessContrastDialog *bcd)
{
if (!bcd->image_map)
g_message (_("brightness_contrast_preview(): No image map"));
g_message ("brightness_contrast_preview(): No image map");
active_tool->preserve = TRUE;
brightness_contrast_lut_setup(bcd->lut, bcd->brightness / 255.0,
bcd->contrast / 127.0,

3
app/tools/by_color_select.c
View File

@ -634,7 +634,8 @@ by_color_select_new_dialog ()
/* the radio buttons */
for (i = 0; i < (sizeof(button_names) / sizeof(button_names[0])); 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",

2
app/tools/color_balance.c
View File

@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map"));
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd);

2
app/tools/curves.c
View File

@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_message (_("curves_preview(): No image map"));
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */

2
app/tools/free_select.c
View File

@ -72,7 +72,7 @@ add_point (int num_pts, int x, int y)
global_pts = (GdkPoint *) g_realloc ((void *) global_pts, sizeof (GdkPoint) * max_segs);
if (!global_pts)
fatal_error (_("Unable to reallocate points array in free_select."));
fatal_error ("Unable to reallocate points array in free_select.");
}
global_pts[num_pts].x = x;

2
app/tools/gimpbrightnesscontrasttool.c
View File

@ -416,7 +416,7 @@ static void
brightness_contrast_preview (BrightnessContrastDialog *bcd)
{
if (!bcd->image_map)
g_message (_("brightness_contrast_preview(): No image map"));
g_message ("brightness_contrast_preview(): No image map");
active_tool->preserve = TRUE;
brightness_contrast_lut_setup(bcd->lut, bcd->brightness / 255.0,
bcd->contrast / 127.0,

3
app/tools/gimpbycolorselecttool.c
View File

@ -634,7 +634,8 @@ by_color_select_new_dialog ()
/* the radio buttons */
for (i = 0; i < (sizeof(button_names) / sizeof(button_names[0])); 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",

2
app/tools/gimpcolorbalancetool.c
View File

@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map"));
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd);

2
app/tools/gimpcurvestool.c
View File

@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_message (_("curves_preview(): No image map"));
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */

2
app/tools/gimpfreeselecttool.c
View File

@ -72,7 +72,7 @@ add_point (int num_pts, int x, int y)
global_pts = (GdkPoint *) g_realloc ((void *) global_pts, sizeof (GdkPoint) * max_segs);
if (!global_pts)
fatal_error (_("Unable to reallocate points array in free_select."));
fatal_error ("Unable to reallocate points array in free_select.");
}
global_pts[num_pts].x = x;

172
app/user_install.c
View File

@ -122,127 +122,127 @@ install_help (InstallCallback callback)
{ 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") },
{ 0, "\n" },
{ 0, N_("This program is free software; you can redistribute it and/or modify\n") },
{ 0, N_("it under the terms of the GNU General Public License as published by\n") },
{ 0, N_("the Free Software Foundation; either version 2 of the License, or\n") },
{ 0, N_("(at your option) any later version.\n") },
{ 0, N_(
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n") },
{ 0, "\n" },
{ 0, N_("This program is distributed in the hope that it will be useful,\n") },
{ 0, N_("but WITHOUT ANY WARRANTY; without even the implied warranty of\n") },
{ 0, N_("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n") },
{ 0, N_("See the GNU General Public License for more details.\n") },
{ 0, N_(
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n") },
{ 0, "\n" },
{ 0, N_("You should have received a copy of the GNU General Public License\n") },
{ 0, N_("along with this program; if not, write to the Free Software\n") },
{ 0, N_("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n") },
{ 0, N_(
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA.\n") },
{ 0, "\n\n" },
{ 2, N_("Personal GIMP Installation\n\n") },
{ 0, N_("For a proper GIMP installation, a subdirectory called\n") },
{ 1, NULL }, /* will be replaced with gimp_directory() */
{ 0, N_(" needs to be created. This\n") },
{ 0, N_("subdirectory will contain a number of important files:\n\n") },
{ 0, N_(" needs to be created. This\n"
"subdirectory will contain a number of important files:\n\n") },
{ 1, N_("gimprc\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n") },
{ 0, N_("\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n") },
{ 0, N_("\t\tPaths to search for brushes, palettes, gradients\n") },
{ 0, N_("\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\n"
"\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n"
"\t\tPaths to search for brushes, palettes, gradients\n"
"\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 1, N_("unitrc\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n") },
{ 0, N_("\t\tYou can define additional units and use them just\n") },
{ 0, N_("\t\tlike you use the built-in units inches, millimeters,\n") },
{ 0, N_("\t\tpoints and picas. This file is overwritten each time\n") },
{ 0, N_("\t\tyou quit the GIMP.\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\n"
"\t\tYou can define additional units and use them just\n"
"\t\tlike you use the built-in units inches, millimeters,\n"
"\t\tpoints and picas. This file is overwritten each time\n"
"\t\tyou quit the GIMP.\n") },
{ 1, N_("pluginrc\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n") },
{ 0, N_("\t\tthe GIMP which provide additional functionality.\n") },
{ 0, N_("\t\tThese programs are searched for at run-time and\n") },
{ 0, N_("\t\tinformation about their functionality and mod-times\n") },
{ 0, N_("\t\tis cached in this file. This file is intended to\n") },
{ 0, N_("\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n"
"\t\tthe GIMP which provide additional functionality.\n"
"\t\tThese programs are searched for at run-time and\n"
"\t\tinformation about their functionality and mod-times\n"
"\t\tis cached in this file. This file is intended to\n"
"\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 1, N_("brushes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined brushes. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp brushes installation when searching for\n") },
{ 0, N_("\t\tbrushes.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined brushes. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp brushes installation when searching for\n"
"\t\tbrushes.\n") },
{ 1, N_("gradients\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gradients. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp gradients installation when searching for\n") },
{ 0, N_("\t\tgradients.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n\t\tuser defined gradients. The default gimprc file\n\t\tchecks this subdirectory in addition to the system-\n\t\twide gimp gradients installation when searching for\n\t\tgradients.\n") },
{ 1, N_("gfig\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined figures to be used by the gfig plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gfig installation\n") },
{ 0, N_("\t\twhen searching for gfig figures.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined figures to be used by the gfig plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gfig installation\n"
"\t\twhen searching for gfig figures.\n") },
{ 1, N_("gflares\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined gflares to be used by the gflare plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp gflares installation\n") },
{ 0, N_("\t\twhen searching for gflares.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined gflares to be used by the gflare plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp gflares installation\n"
"\t\twhen searching for gflares.\n") },
{ 1, N_("fractalexplorer\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory in\n") },
{ 0, N_("\t\taddition to the systemwide gimp FractalExplorer installation\n") },
{ 0, N_("\t\twhen searching for fractals.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined fractals to be used by the FractalExplorer plug-in.\n"
"\t\tThe default gimprc file checks this subdirectory in\n"
"\t\taddition to the systemwide gimp FractalExplorer installation\n"
"\t\twhen searching for fractals.\n") },
{ 1, N_("palettes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined palettes. The default gimprc file\n") },
{ 0, N_("\t\tchecks only this subdirectory (not the system-wide\n") },
{ 0, N_("\t\tinstallation) when searching for palettes. During\n") },
{ 0, N_("\t\tinstallation, the system palettes will be copied\n") },
{ 0, N_("\t\there. This is done to allow modifications made to\n") },
{ 0, N_("\t\tpalettes during GIMP execution to persist across\n") },
{ 0, N_("\t\tsessions.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined palettes. The default gimprc file\n"
"\t\tchecks only this subdirectory (not the system-wide\n"
"\t\tinstallation) when searching for palettes. During\n"
"\t\tinstallation, the system palettes will be copied\n"
"\t\there. This is done to allow modifications made to\n"
"\t\tpalettes during GIMP execution to persist across\n"
"\t\tsessions.\n") },
{ 1, N_("patterns\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser defined patterns. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide gimp patterns installation when searching for\n") },
{ 0, N_("\t\tpatterns.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser defined patterns. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide gimp patterns installation when searching for\n"
"\t\tpatterns.\n") },
{ 1, N_("plug-ins\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") },
{ 0, N_("\t\tuser created, temporary, or otherwise non-system-\n") },
{ 0, N_("\t\tsupported plug-ins. The default gimprc file\n") },
{ 0, N_("\t\tchecks this subdirectory in addition to the system-\n") },
{ 0, N_("\t\twide GIMP plug-in directories when searching for\n") },
{ 0, N_("\t\tplug-ins.\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n"
"\t\tuser created, temporary, or otherwise non-system-\n"
"\t\tsupported plug-ins. The default gimprc file\n"
"\t\tchecks this subdirectory in addition to the system-\n"
"\t\twide GIMP plug-in directories when searching for\n"
"\t\tplug-ins.\n") },
{ 1, N_("modules\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n") },
{ 0, N_("\t\ttemporary, or otherwise non-system-supported DLL modules.\n") },
{ 0, N_("\t\tThe default gimprc file checks this subdirectory\n") },
{ 0, N_("\t\tin addition to the system-wide GIMP module directory\n") },
{ 0, N_("\t\twhen searching for modules to load when initialising.\n") },
{ 0, N_("\t\tThis subdirectory can be used to store user created,\n"
"\t\ttemporary, or otherwise non-system-supported DLL modules.\n"
"\t\tThe default gimprc file checks this subdirectory\n"
"\t\tin addition to the system-wide GIMP module directory\n"
"\t\twhen searching for modules to load when initialising.\n") },
{ 1, N_("scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n") },
{ 0, N_("\t\tuser created and installed scripts. The default gimprc\n") },
{ 0, N_("\t\tfile checks this subdirectory in addition to the system\n") },
{ 0, N_("\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to store \n"
"\t\tuser created and installed scripts. The default gimprc\n"
"\t\tfile checks this subdirectory in addition to the system\n"
"\t\t-wide gimp scripts subdirectory when searching for scripts\n") },
{ 1, N_("tmp\n") },
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n") },
{ 0, N_("\t\tstore undo buffers to reduce memory usage. If GIMP is\n") },
{ 0, N_("\t\tunceremoniously killed, files may persist in this directory\n") },
{ 0, N_("\t\tof the form: gimp<#>.<#>. These files are useless across\n") },
{ 0, N_("\t\tGIMP sessions and can be destroyed with impunity.\n") }
{ 0, N_("\t\tThis subdirectory is used by the GIMP to temporarily\n"
"\t\tstore undo buffers to reduce memory usage. If GIMP is\n"
"\t\tunceremoniously killed, files may persist in this directory\n"
"\t\tof the form: gimp<#>.<#>. These files are useless across\n"
"\t\tGIMP sessions and can be destroyed with impunity.\n") }
};
gint nhelp_lines = sizeof (help_lines) / sizeof (help_lines[0]);
gint i;

12
app/widgets/gimpgradienteditor.c
View File

@ -2256,8 +2256,8 @@ control_do_hint(gint x, gint y)
break;
default:
g_message (_("control_do_hint: oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_do_hint: oops, in_handle is true "
"yet we got handle type %d", (int) handle);
break;
} /* switch */
} else
@ -2360,8 +2360,8 @@ control_button_press(gint x, gint y, guint button, guint state)
return;
default:
g_message (_("control_button_press(): oops, in_handle is true "
"yet we got handle type %d"), (int) handle);
g_message ("control_button_press(): oops, in_handle is true "
"yet we got handle type %d", (int) handle);
return;
} /* switch */
else {
@ -2404,7 +2404,7 @@ control_point_in_handle(gint x, gint y, grad_segment_t *seg, control_drag_mode_t
break;
default:
g_message (_("control_point_in_handle(): oops, can not handle drag mode %d"),
g_message ("control_point_in_handle(): oops, can not handle drag mode %d",
(int) handle);
return 0;
} /* switch */
@ -2498,7 +2498,7 @@ control_motion(gint x)
break;
default:
fatal_error(_("control_motion(): aieee, attempt to move bogus handle %d"),
fatal_error("control_motion(): aieee, attempt to move bogus handle %d",
(int) g_editor->control_drag_mode);
break;
} /* switch */

89
config.guess vendored
View File

@ -1,6 +1,7 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
# Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -114,7 +115,13 @@ EOF
esac
fi
rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
@ -158,7 +165,7 @@ EOF
SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
@ -414,7 +421,7 @@ EOF
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
9000/[678][0-9][0-9])
sed 's/^ //' << EOF >$dummy.c
#include <stdlib.h>
#include <unistd.h>
@ -488,7 +495,7 @@ EOF
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
*9??*:MPE*:*:*)
*9??*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@ -507,6 +514,9 @@ EOF
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
hppa*:OpenBSD:*:*)
echo hppa-unknown-openbsd
exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@ -546,7 +556,7 @@ EOF
echo cray2-cray-unicos
exit 0 ;;
F300:UNIX_System_V:*:*)
FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
@ -559,12 +569,12 @@ EOF
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
@ -589,6 +599,15 @@ EOF
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i386-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@ -622,7 +641,36 @@ EOF
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
elf32ppc)
# Determine Lib Version
cat >$dummy.c <<EOF
#include <features.h>
#if defined(__GLIBC__)
extern char __libc_version[];
extern char __libc_release[];
#endif
main(argc, argv)
int argc;
char *argv[];
{
#if defined(__GLIBC__)
printf("%s %s\n", __libc_version, __libc_release);
#else
printf("unkown\n");
#endif
return 0;
}
EOF
LIBC=""
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
if test "$?" = 0 ; then
./$dummy | grep 1\.99 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
fi
rm -f $dummy.c $dummy
echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
@ -755,6 +803,14 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
i?86:*:5:7*)
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@ -764,18 +820,15 @@ EOF
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
&& UNAME_MACHINE=i686
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
i?86:UnixWare:*:*)
if /bin/uname -X 2>/dev/null >/dev/null ; then
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
fi
echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
exit 0 ;;
pc:*:*:*)
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
@ -862,7 +915,7 @@ EOF
news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else

286
config.sub vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
@ -98,11 +98,21 @@ case $os in
os=
basic_machine=$1
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
;;
-scout)
;;
-wrs)
os=vxworks
basic_machine=$1
;;
-hiux*)
os=-hiuxwe2
;;
-sco5)
os=sco3.2v5
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
@ -121,6 +131,9 @@ case $os in
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -152,14 +165,20 @@ case $basic_machine in
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 | mips64 | mipsel | mips64el \
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| sparc | sparclet | sparclite | sparc64 | v850)
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
| mips64vr5000 | miprs64vr5000el \
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
| thumb | d10v)
basic_machine=$basic_machine-unknown
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@ -175,26 +194,41 @@ case $basic_machine in
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
| alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67] \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
| alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
| sparc64-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* \
| f301-* | armv*-*)
| f301-* | armv*-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
| thumb-* | v850-* | d30v-* | tic30-* | c30-* )
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
basic_machine=i386-unknown
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
basic_machine=m68000-att
;;
3b*)
basic_machine=we32k-att
;;
a29khif)
basic_machine=a29k-amd
os=-udi
;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
;;
alliant | fx80)
basic_machine=fx80-alliant
;;
@ -224,6 +258,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-sysv
;;
apollo68bsd)
basic_machine=m68k-apollo
os=-bsd
;;
aux)
basic_machine=m68k-apple
os=-aux
@ -300,6 +338,10 @@ case $basic_machine in
encore | umax | mmax)
basic_machine=ns32k-encore
;;
es1800 | OSE68k | ose68k | ose | OSE)
basic_machine=m68k-ericsson
os=-ose
;;
fx2800)
basic_machine=i860-alliant
;;
@ -318,6 +360,14 @@ case $basic_machine in
basic_machine=h8300-hitachi
os=-hms
;;
h8300xray)
basic_machine=h8300-hitachi
os=-xray
;;
h8500hms)
basic_machine=h8500-hitachi
os=-hms
;;
harris)
basic_machine=m88k-harris
os=-sysv3
@ -333,13 +383,30 @@ case $basic_machine in
basic_machine=m68k-hp
os=-hpux
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
;;
hp9k2[0-9][0-9] | hp9k31[0-9])
basic_machine=m68000-hp
;;
hp9k3[2-9][0-9])
basic_machine=m68k-hp
;;
hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
hp9k6[0-9][0-9] | hp6[0-9][0-9])
basic_machine=hppa1.0-hp
;;
hp9k7[0-79][0-9] | hp7[0-79][0-9])
basic_machine=hppa1.1-hp
;;
hp9k78[0-9] | hp78[0-9])
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
# FIXME: really hppa2.0-hp
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][13679] | hp8[0-9][13679])
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
@ -348,13 +415,13 @@ case $basic_machine in
hppa-next)
os=-nextstep3
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
os=-mpeix
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
os=-mpeix
hppro)
basic_machine=hppa1.1-hp
os=-proelf
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
@ -377,6 +444,22 @@ case $basic_machine in
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
i386-vsta | vsta)
basic_machine=i386-unknown
os=-vsta
;;
i386-go32 | go32)
basic_machine=i386-unknown
os=-go32
;;
i386-mingw32 | mingw32)
basic_machine=i386-unknown
os=-mingw32
;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@ -405,6 +488,10 @@ case $basic_machine in
miniframe)
basic_machine=m68000-convergent
;;
*mint | *MiNT)
basic_machine=m68k-atari
os=-mint
;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
@ -419,10 +506,22 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
os=-coff
;;
msdos)
basic_machine=i386-unknown
os=-msdos
;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
;;
netbsd386)
basic_machine=i386-unknown
os=-netbsd
;;
netwinder)
basic_machine=armv4l-corel
os=-linux
@ -439,6 +538,10 @@ case $basic_machine in
basic_machine=mips-sony
os=-newsos
;;
necv70)
basic_machine=v70-nec
os=-sysv
;;
next | m*-next )
basic_machine=m68k-next
case $os in
@ -464,9 +567,25 @@ case $basic_machine in
basic_machine=i960-intel
os=-nindy
;;
mon960)
basic_machine=i960-intel
os=-mon960
;;
np1)
basic_machine=np1-gould
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
;;
os68k)
basic_machine=m68k-none
os=-os68k
;;
pa-hitachi)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
@ -484,19 +603,19 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pentium | p5 | k5 | nexen)
pentium | p5 | k5 | k6 | nexen)
basic_machine=i586-pc
;;
pentiumpro | p6 | k6 | 6x86)
pentiumpro | p6 | 6x86)
basic_machine=i686-pc
;;
pentiumii | pentium2)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | nexen-*)
pentium-* | p5-* | k5-* | k6-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | k6-* | 6x86-*)
pentiumpro-* | p6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
@ -520,12 +639,20 @@ case $basic_machine in
ps2)
basic_machine=i386-ibm
;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
;;
rm[46]00)
basic_machine=mips-siemens
;;
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
sequent)
basic_machine=i386-sequent
;;
@ -533,6 +660,10 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sparclite-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
sps7)
basic_machine=m68k-bull
os=-sysv2
@ -540,6 +671,13 @@ case $basic_machine in
spur)
basic_machine=spur-unknown
;;
st2000)
basic_machine=m68k-tandem
;;
stratus)
basic_machine=i860-stratus
os=-sysv4
;;
sun2)
basic_machine=m68000-sun
;;
@ -584,6 +722,10 @@ case $basic_machine in
basic_machine=i386-sequent
os=-dynix
;;
t3e)
basic_machine=t3e-cray
os=-unicos
;;
tx39)
basic_machine=mipstx39-unknown
;;
@ -601,6 +743,10 @@ case $basic_machine in
basic_machine=a29k-nyu
os=-sym1
;;
v810 | necv810)
basic_machine=v810-nec
os=-none
;;
vaxv)
basic_machine=vax-dec
os=-sysv
@ -624,6 +770,14 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
w65*)
basic_machine=w65-wdc
os=-none
;;
w89k-*)
basic_machine=hppa1.1-winbond
os=-proelf
;;
xmp)
basic_machine=xmp-cray
os=-unicos
@ -631,9 +785,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
*mint | *MiNT)
basic_machine=m68k-atari
os=-mint
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
;;
none)
basic_machine=none-none
@ -642,6 +796,15 @@ case $basic_machine in
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
w89k)
basic_machine=hppa1.1-winbond
;;
op50n)
basic_machine=hppa1.1-oki
;;
op60c)
basic_machine=hppa1.1-oki
;;
mips)
if [ x$os = x-linux-gnu ]; then
basic_machine=mips-unknown
@ -664,7 +827,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sparc)
sparc | sparcv9)
basic_machine=sparc-sun
;;
cydra)
@ -676,6 +839,16 @@ case $basic_machine in
orion105)
basic_machine=clipper-highlevel
;;
mac | mpw | mac-mpw)
basic_machine=m68k-apple
;;
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@ -729,14 +902,21 @@ case $os in
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
| -openstep* | -mpeix* | -oskit*)
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@ -761,6 +941,9 @@ case $os in
-acis*)
os=-aos
;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
@ -792,6 +975,12 @@ case $os in
# This must come after -sysvr4.
-sysv*)
;;
-ose*)
os=-ose
;;
-es1800*)
os=-ose
;;
-xenix)
os=-xenix
;;
@ -847,6 +1036,15 @@ case $basic_machine in
# default.
# os=-sunos4
;;
m68*-cisco)
os=-aout
;;
mips*-cisco)
os=-elf
;;
mips*-*)
os=-elf
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@ -859,6 +1057,15 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-wec)
os=-proelf
;;
*-winbond)
os=-proelf
;;
*-oki)
os=-proelf
;;
*-hp)
os=-hpux
;;
@ -922,6 +1129,15 @@ case $basic_machine in
f301-fujitsu)
os=-uxpv
;;
*-rom68k)
os=-coff
;;
*-*bug)
os=-coff
;;
*-apple)
os=-macos
;;
*-atari*)
os=-mint
;;
@ -946,10 +1162,10 @@ case $basic_machine in
-aix*)
vendor=ibm
;;
-hpux*)
vendor=hp
-beos*)
vendor=be
;;
-mpeix*)
-hpux*)
vendor=hp
;;
-mpeix*)
@ -982,6 +1198,12 @@ case $basic_machine in
-aux*)
vendor=apple
;;
-hms*)
vendor=hitachi
;;
-mpw* | -macos*)
vendor=apple
;;
-*mint | -*MiNT)
vendor=atari
;;

11
configure.in
View File

@ -633,6 +633,12 @@ AC_SUBST(GIMP_MP_LIBS)
AC_SUBST(GIMP_PERL)
AC_SUBST(GIMPDOCS)
dnl easy way to skip the plug-in build
GIMP_PLUGINS=plug-ins
GIMP_MODULES=modules
AC_SUBST(GIMP_PLUGINS)
AC_SUBST(GIMP_MODULES)
dnl Output the Makefiles
AC_OUTPUT([
@ -802,16 +808,19 @@ data/Makefile
data/brushes/Makefile
data/gradients/Makefile
data/palettes/Makefile
data/patterns/Makefile
Makefile
po/Makefile.in
po-plug-ins/Makefile.in
intl/Makefile
tools/Makefile
tools/pdbgen/Makefile
libgimp/Makefile
data/patterns/Makefile],
tips/Makefile],
[
chmod +x gimptool
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
sed -e "/POTFILES =/r po-plug-ins/POTFILES" po-plug-ins/Makefile.in > po-plug-ins/Makefile
case "$CONFIG_FILES" in
*plug-ins/perl*)
if test -f plug-ins/perl/config.status; then

159
gimp_tips.fr.txt
View File

@ -1,159 +0,0 @@
# This is a list of tips for the GIMP. Every time the GIMP is
# started, one tip will be selected from this file and will be
# displayed in the "Tip of the day" dialog.
#
# - Lines starting with '#' are comments.
# - Blank lines or comments separate two tips (they are not ignored).
# Multiple blank lines are treated as one. If you want to have a
# blank line in a tip, put a space or tab in it.
# - Text will appear in the dialog as it is in this file. This is
# done on purpose in order to have more freedom in the layout of the
# tips than with automatic word-wrapping, but this also means that
# you have to avoid excessively long lines in this file.
# - Tips should be concise: 3 lines or less.
#
# Tips in this file have been contributed by Zachary Beane, Mo Oishi,
# Raphael Quinet, Sven Neumann and other people on the gimp mailing
# lists.
# French translation by Vincent Renardias <vincent@ldsol.com>
# --------------------------------------------------------------------
# The first tip should be a welcome message, because this is the
# first thing that a new user will see.
#
# FIXME: re-write this welcome message:
Bienvenue dans The GIMP !
Presques toutes les opérations sur les images peuvent être réalisées
en cliquant avec le bouton droit sur l'image. Et ne vous inquiétez pas,
vous pouvez annuler la plupart des erreurs...
# Tips for beginners start here
#
The GIMP utilise des calques pour vous permettre d'organiser votre image.
Vous pouvez les considérer comme une pile de transparents ou de filtres,
de sorte qu'en regardant à travers vous voyez la composition de leurs contenus.
Vous pouvez effectuer la plupart des opérations sur les calques en cliquant
avec le bouton droit sur le label texte du calque dans le dialogue Calques
(Dialogues->Calques & Canaux).
Si vous voulez enregistrer votre image en GIF, XPM ou n'importe quel autre
format indexé sur les couleurs, vous devrez auparavant convertir l'image
en couleurs indexées à partir du menu Image.
Vous pouvez ouvrir le menu Options des Outils en double-cliquant sur n'importe
quel bouton de la barre d'outil.
Vous pouvez changer le nom d'un calque en double-cliquant sur son nom dans la
boîte de dialogue 'Calques'.
La couche nommée "Fond" est spéciale. Vous ne pouvez pas y ajouter de transparence
ou de masque de couche. Pour ajouter une transparence, vous devez d'abord
"ajouter alpha" au calque en cliquant avec le bouton droit dans le dialogue Calques
et en sélectionnant "Ajouter Canal Alpha".
Lorsque vous utilisez un outil de dessin (Brosse, Aérossol ou Crayon),
Shift-click dessinera en ligne droite entre votre dernier point de dessin
et la position courante de votre curseur.
La plupart des plug-ins agissent sur le calque courant de l'image. Dans certains
cas, vous aurez a fusionner tous les calques (Calques->Applanir l'Image) si vous
désirez que le plug-in agisse sur l'image entière.
La plupart des formats de fichiers ne peuvent gérer les calques et pour cette
raison, seul le calque actif est enregistré. Utilisez XCF, le format de fichier
natif GIMP pour conserver les calques, canaux et guides lors de l'enregistrement.
Tous les effets ne peuvent pas être appliqués a toutes les sortes d'images. Cela
est indiqué par une entré de menu grisée. Vous devrez soit passer l'image en RVB
ou ajouter un canal alpha ou l'applanir.
# Tips for intermediate users start here
#
La boîte de sélection de fichiers comporte une complétion avec la touche Tab,
exactement comme le shell. Tapez le début du nom de fichier, tapez Tab et Voila!
C'est complété.
Vous pouvez reassigner de nouveaux raccourcis clavier sur n'importe quel menu en
cliquant sur le menu, sélectionnant un élément de menu, et pressant le nouveau
racourcis à utiliser. Cela est dynamique et est enregistré automatiquement lorsque
vous quittez GIMP.
Toutes les anciennes opérations sur les canaux ont été remplacées avec les puissantes
et extensibles opérations sur Calques et Modes de Calques. Elles peuvent nécessiter
quelques temps pour s'y habituer, mais elles en vallent la peine.
Vous pouvez utiliser le bouton du milieu pour vous déplacer dans l'image si elle
est plus grande que la fenêtre dans laquelle elle est affichée.
Cliquez et tirez sur une régle pour place un Guide sur votre image. Toutes les
sélections déplacées auront tendance a coller aux guides. Vous pouvez enlever
les guides en les tirant en dehors de l'image avec l'outil Déplacement.
The GIMP supporte la compression gzip à la volée. Ajoutez simplement
'.gz' (ou '.bz2, si vous avez bzip2 installé) au nom du fichier et votre
image sera enregistrée compressée. Bien sur, le chargement d'images compressées
est également supporté.
Pressez et conservez la touche Shift enfoncée avant de faire une sélection permet
d'ajouter à la sélection courante au lieu de la remplacer. L'utilisation de Ctrl
avant de faire une sélection la soustrait de la sélection courante.
Vous pouvez presser et relacher les touches Shift et Ctrl pendant que vous êtes
en train de faire une sélection pour la contraindre en un carré ou un cercle,
ou pour l'avoir centré sur son point d'origine.
# Tips for advanced users start here
#
You can adjust the selection range for fuzzy select
by clicking and dragging left and right.
Shift-cliquez sur l'icone Oeil dans le dialogue Calques pour cacher tous les calques
sauf celui-la. Shift-clic a nouveau pour afficher tous les calques à nouveau.
Ctrl-click on the layer mask's preview in the Layers dialog
toggles the effect of the layer mask.
Alt-click on the layer mask's preview in the Layers dialog
toggles viewing the mask directly.
Vous pouvez utiliser Alt-Tab pour cycler à travers tous les calques d'une image
(si votre gestionnaire de fenêtres n'intercepte pas cette combinaison de touches...).
Shift-click with the Bucket Fill tool to have it use
the background color instead of the foreground color.
Control-glisser avec l'outil Transformation en mode rotation contraindra la rotation
a s'effectuer par pas de 15 degrés.
Vous pouvez ajuster et re-placer une sélection en utilisant Alt-glisser.
If your fonts turn out blocky, that's because they're not scalable
fonts. Most X servers support scalable Type 1 Postscript fonts.
Download and install them.
# FIXME: The next tip should disappear once we have solved the
# problems of stale pluginrc files and plug-in directories.
# All other files in ~/.gimp can be kept after an upgrade.
# In particular, we should try to preserve gimprc. --Raphael
Lorsque vous installez une nouvelle version, pensez d'abord a effacer
votre répertoire ~/.gimp.
Using Edit->Stroke allows you to draw simple squares or circles by
painting the edge of your current selection with the active brush.
More complex shapes can be drawn with Filters->Render->Gfig.
To create a perfect circle, hold Shift while doing an ellipse select. To
place a circle precisely, drag horizontal and vertical guides tangent to
the circle you want to select, place your cursor at the intersection
of the guides, and the resulting selection will just touch the guides.
# (end of tips)

1
libgimp/gimpunit.c
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "gimp.h"
#include "gimpunit.h"
#include "libgimp/gimpintl.h"

1
libgimp/gimpunit_pdb.c
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "gimp.h"
#include "gimpunit.h"
#include "libgimp/gimpintl.h"

1
libgimp/gimpunitcache.c
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "gimp.h"
#include "gimpunit.h"
#include "libgimp/gimpintl.h"

2
libgimp/gimpunitmenu.c
View File

@ -19,6 +19,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "gimpunitmenu.h"
#include "libgimp/gimpintl.h"

13
libgimp/stdplugins-intl.h Normal file
View File

@ -0,0 +1,13 @@
#include "libgimp/gimpintl.h"
#ifdef HAVE_LC_MESSAGES
#define INIT_I18N() \
setlocale(LC_MESSAGES, ""); \
bindtextdomain("gimp-std-plugins", LOCALEDIR); \
textdomain("gimp-std-plugins")
#else
#define INIT_I18N() \
bindtextdomain("gimp-std-plugins", LOCALEDIR); \
textdomain("gimp-std-plugins")
#endif

2
libgimpwidgets/gimpunitmenu.c
View File

@ -19,6 +19,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "gimpunitmenu.h"
#include "libgimp/gimpintl.h"

221
ltconfig
View File

@ -169,8 +169,8 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
# Constants:
PROGRAM=ltconfig
PACKAGE=libtool
VERSION=1.3
TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)"
VERSION=1.3.2
TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
rm="rm -f"
@ -650,6 +650,11 @@ if test "$with_gcc" = yes; then
# like `-m68040'.
pic_flag='-m68020 -resident32 -malways-restore-a4'
;;
sysv4*MP*)
if test -d /usr/nec; then
pic_flag=-Kconform_pic
fi
;;
*)
pic_flag='-fPIC'
;;
@ -713,7 +718,12 @@ else
pic_flag='-pic'
link_static_flag='-Bstatic'
;;
sysv4*MP*)
if test -d /usr/nec ;then
pic_flag='-Kconform_pic'
link_static_flag='-Bstatic'
fi
;;
*)
can_build_shared=no
;;
@ -729,8 +739,8 @@ if test -n "$pic_flag"; then
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pic_flag -DPIC"
echo "$progname:732: checking if $compiler PIC flag $pic_flag works" >&5
if { (eval echo $progname:733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
echo "$progname:742: checking if $compiler PIC flag $pic_flag works" >&5
if { (eval echo $progname:743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
# Append any warnings to the config.log.
cat conftest.err 1>&5
@ -782,8 +792,8 @@ mkdir out
chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.o"
echo "$progname:785: checking if $compiler supports -c -o file.o" >&5
if { (eval echo $progname:786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
echo "$progname:795: checking if $compiler supports -c -o file.o" >&5
if { (eval echo $progname:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -815,8 +825,8 @@ if test x"$compiler_c_o" = x"yes"; then
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -c -o conftest.lo"
echo "$progname:818: checking if $compiler supports -c -o file.lo" >&5
if { (eval echo $progname:819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
echo "$progname:828: checking if $compiler supports -c -o file.lo" >&5
if { (eval echo $progname:829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -867,8 +877,8 @@ if test "$with_gcc" = yes; then
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
echo "$progname:870: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
if { (eval echo $progname:871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
echo "$progname:880: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
if { (eval echo $progname:881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -911,8 +921,8 @@ $rm conftest*
echo 'main(){return(0);}' > conftest.c
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $link_static_flag"
echo "$progname:914: checking if $compiler static flag $link_static_flag works" >&5
if { (eval echo $progname:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
echo "$progname:924: checking if $compiler static flag $link_static_flag works" >&5
if { (eval echo $progname:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
echo "$ac_t$link_static_flag" 1>&6
else
echo "$ac_t"none 1>&6
@ -944,7 +954,7 @@ if test -z "$LD"; then
if test "$with_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
echo "$progname:947: checking for ld used by GCC" >&5
echo "$progname:957: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@ -968,10 +978,10 @@ if test -z "$LD"; then
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld... $ac_c" 1>&6
echo "$progname:971: checking for GNU ld" >&5
echo "$progname:981: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
echo "$progname:974: checking for non-GNU ld" >&5
echo "$progname:984: checking for non-GNU ld" >&5
fi
if test -z "$LD"; then
@ -1151,6 +1161,27 @@ EOF
fi
;;
solaris*)
if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.9.1 or newer. Another option is to modify
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
EOF
elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
;;
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
wlarc=
@ -1172,7 +1203,15 @@ EOF
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec='${wl}--export-dynamic'
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
case $host_os in
cygwin* | mingw*)
# dlltool doesn't understand --whole-archive et. al.
whole_archive_flag_spec=
;;
*)
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
;;
esac
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@ -1362,7 +1401,7 @@ else
case "$host_os" in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
esac
;;
@ -1399,6 +1438,17 @@ else
hardcode_shlibpath_var=no
;;
sysv4*MP*)
if test -d /usr/nec ;then
# archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
hardcode_shlibpath_var=no
runpath_var=LD_RUN_PATH
hardcode_runpath_var=yes
ld_shlibs=yes
fi
;;
*)
ld_shlibs=no
;;
@ -1504,11 +1554,11 @@ void nm_test_func(){}
main(){nm_test_var='a';nm_test_func();return(0);}
EOF
echo "$progname:1507: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:1508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
echo "$progname:1557: checking if global_symbol_pipe works" >&5
if { (eval echo $progname:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
# Now try to grab the symbols.
nlist=conftest.nm
if { echo "$progname:1511: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
if { echo "$progname:1561: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@ -1560,7 +1610,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$objext"
CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo $progname:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5
@ -1694,6 +1744,7 @@ beos*)
library_names_spec='${libname}.so'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
deplibs_check_method=pass_all
lt_cv_dlopen="load_add_on"
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@ -1960,6 +2011,15 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
sysv4*MP*)
if test -d /usr/nec ;then
version_type=linux
library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
soname_spec='$libname.so.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
*)
dynamic_linker=no
;;
@ -2059,13 +2119,50 @@ if test "x$enable_dlopen" != xyes; then
else
if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
lt_cv_dlopen=no lt_cv_dlopen_libs=
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "$progname:2123: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2131 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dlopen();
int main() {
dlopen()
; return 0; }
EOF
if { (eval echo $progname:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
echo "$progname:2063: checking for dlopen" >&5
echo "$progname:2160: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2068 "ltconfig"
#line 2165 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
#include <assert.h>
@ -2087,7 +2184,7 @@ dlopen();
; return 0; }
EOF
if { (eval echo $progname:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@ -2098,51 +2195,13 @@ else
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
echo "$ac_t""yes" 1>&6
lt_cv_dlopen="dlopen"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "$progname:2108: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2116 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dlopen();
int main() {
dlopen()
; return 0; }
EOF
if { (eval echo $progname:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
echo "$progname:2145: checking for dld_link in -ldld" >&5
echo "$progname:2204: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -2150,7 +2209,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2153 "ltconfig"
#line 2212 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@ -2160,7 +2219,7 @@ int main() {
dld_link()
; return 0; }
EOF
if { (eval echo $progname:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2179,12 +2238,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
echo "$progname:2182: checking for shl_load" >&5
echo "$progname:2241: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2187 "ltconfig"
#line 2246 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
#include <assert.h>
@ -2206,7 +2265,7 @@ shl_load();
; return 0; }
EOF
if { (eval echo $progname:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@ -2224,7 +2283,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
echo "$progname:2227: checking for shl_load in -ldld" >&5
echo "$progname:2286: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -2232,7 +2291,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2235 "ltconfig"
#line 2294 "ltconfig"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -2243,7 +2302,7 @@ int main() {
shl_load()
; return 0; }
EOF
if { (eval echo $progname:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo $progname:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -2286,17 +2345,17 @@ fi
for ac_hdr in dlfcn.h; do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "$progname:2289: checking for $ac_hdr" >&5
echo "$progname:2348: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2294 "ltconfig"
#line 2353 "ltconfig"
#include <$ac_hdr>
int fnord = 0;
EOF
ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo $progname:2299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo $progname:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@ -2324,7 +2383,7 @@ done
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
echo "$progname:2327: checking whether a program can dlopen itself" >&5
echo "$progname:2386: checking whether a program can dlopen itself" >&5
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2332,7 +2391,7 @@ else
lt_cv_dlopen_self=cross
else
cat > conftest.c <<EOF
#line 2335 "ltconfig"
#line 2394 "ltconfig"
#if HAVE_DLFCN_H
#include <dlfcn.h>
@ -2378,7 +2437,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
if(ptr1 || ptr2) exit(0); } exit(1); }
EOF
if { (eval echo $progname:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo $progname:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self=yes
else
@ -2397,7 +2456,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "$lt_cv_dlopen_self" = yes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
echo "$progname:2400: checking whether a statically linked program can dlopen itself" >&5
echo "$progname:2459: checking whether a statically linked program can dlopen itself" >&5
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2405,7 +2464,7 @@ else
lt_cv_dlopen_self_static=cross
else
cat > conftest.c <<EOF
#line 2408 "ltconfig"
#line 2467 "ltconfig"
#if HAVE_DLFCN_H
#include <dlfcn.h>
@ -2451,7 +2510,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
if(ptr1 || ptr2) exit(0); } exit(1); }
EOF
if { (eval echo $progname:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo $progname:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self_static=yes
else

18
ltmain.sh
View File

@ -54,8 +54,8 @@ modename="$progname"
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.3
TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)"
VERSION=1.3.2
TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
default_mode=
help="Try \`$progname --help' for more information."
@ -466,6 +466,7 @@ compiler."
command="$command -o $output_obj"
fi
$run $rm "$output_obj"
$show "$command"
if $run eval "$command"; then :
else
@ -545,6 +546,7 @@ compiler."
# Suppress compiler output if we already did a PIC compilation.
command="$command$suppress_output"
$run $rm "$output_obj"
$show "$command"
if $run eval "$command"; then :
else
@ -1021,8 +1023,9 @@ compiler."
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
exit 1
$echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
$echo "$modename: passing it literally to the linker, although it might fail" 1>&2
absdir="$dir"
fi
dir="$absdir"
;;
@ -1294,8 +1297,9 @@ compiler."
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
exit 1
$echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
$echo "$modename: passing it literally to the linker, although it might fail" 1>&2
absdir="$dir"
fi
;;
esac
@ -1902,7 +1906,7 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potlib" 2>/dev/null \
if ls -lLd "$potent_lib" 2>/dev/null \
| grep " -> " >/dev/null; then
continue
fi

3
plug-ins/CEL/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

265
plug-ins/CML_explorer/CML_explorer.c
View File

@ -81,6 +81,9 @@
#include <sys/stat.h>
#include <time.h> /* for seed of random number */
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
@ -220,107 +223,107 @@ static GtkTooltips *gtkW_tooltips_new (GtkWidget *frame);
gtkW_menu_item function_menu [] =
{
#define CML_KEEP_VALUES 0
{ "Keep image's values", NULL },
{ N_("Keep image's values"), NULL },
#define CML_KEEP_FIRST 1
{ "Keep the first value", NULL },
{ N_("Keep the first value"), NULL },
#define CML_FILL 2
{ "Fill with parameter k", NULL },
{ N_("Fill with parameter k"), NULL },
#define CML_LOGIST 3
{ "k{x(1-x)}^p", NULL },
{ N_("k{x(1-x)}^p"), NULL },
#define CML_LOGIST_STEP 4
{ "k{x(1-x)}^p stepped", NULL },
{ N_("k{x(1-x)}^p stepped"), NULL },
#define CML_POWER 5
{ "kx^p", NULL },
{ N_("kx^p"), NULL },
#define CML_POWER_STEP 6
{ "kx^p stepped", NULL },
{ N_("kx^p stepped"), NULL },
#define CML_REV_POWER 7
{ "k(1 - x^p)", NULL },
{ N_("k(1 - x^p)"), NULL },
#define CML_REV_POWER_STEP 8
{ "k(1 - x^p) stepped", NULL },
{ N_("k(1 - x^p) stepped"), NULL },
#define CML_DELTA 9
{ "Delta function", NULL },
{ N_("Delta function"), NULL },
#define CML_DELTA_STEP 10
{ "Delta function stepped", NULL },
{ N_("Delta function stepped"), NULL },
#define CML_SIN_CURVE 11
{ "sin^p-based function", NULL },
{ N_("sin^p-based function"), NULL },
#define CML_SIN_CURVE_STEP 12
{ "sin^p, stepped", NULL },
{ N_("sin^p, stepped"), NULL },
};
gtkW_menu_item composition_menu [] =
{
#define COMP_NONE 0
{ "None", NULL },
{ N_("None"), NULL },
#define COMP_MAX_LINEAR 1
{ "Max (x, -)", NULL },
{ N_("Max (x, -)"), NULL },
#define COMP_MAX_LINEAR_P1 2
{ "Max (x+d, -)", NULL },
{ N_("Max (x+d, -)"), NULL },
#define COMP_MAX_LINEAR_M1 3
{ "Max (x-d, -)", NULL },
{ N_("Max (x-d, -)"), NULL },
#define COMP_MIN_LINEAR 4
{ "Mix (x, -)", NULL },
{ N_("Mix (x, -)"), NULL },
#define COMP_MIN_LINEAR_P1 5
{ "Min (x+d, -)", NULL },
{ N_("Min (x+d, -)"), NULL },
#define COMP_MIN_LINEAR_M1 6
{ "Min (x-d, -)", NULL },
{ N_("Min (x-d, -)"), NULL },
#define COMP_MAX_LINEAR_P1L 7
{ "Max (x+d, -), (x < 0.5)", NULL },
{ N_("Max (x+d, -), (x < 0.5)"), NULL },
#define COMP_MAX_LINEAR_P1U 8
{ "Max (x+d, -), (0.5 < x)", NULL },
{ N_("Max (x+d, -), (0.5 < x)"), NULL },
#define COMP_MAX_LINEAR_M1L 9
{ "Max (x-d, -), (x < 0.5)", NULL },
{ N_("Max (x-d, -), (x < 0.5)"), NULL },
#define COMP_MAX_LINEAR_M1U 10
{ "Max (x-d, -), (0.5 < x)", NULL },
{ N_("Max (x-d, -), (0.5 < x)"), NULL },
#define COMP_MIN_LINEAR_P1L 11
{ "Min (x+d, -), (x < 0.5)", NULL },
{ N_("Min (x+d, -), (x < 0.5)"), NULL },
#define COMP_MIN_LINEAR_P1U 12
{ "Min (x+d, -), (0.5 < x)", NULL },
{ N_("Min (x+d, -), (0.5 < x)"), NULL },
#define COMP_MIN_LINEAR_M1L 13
{ "Min (x-d, -), (x < 0.5)", NULL },
{ N_("Min (x-d, -), (x < 0.5)"), NULL },
#define COMP_MIN_LINEAR_M1U 14
{ "Min (x-d, -), (0.5 < x)", NULL }
{ N_("Min (x-d, -), (0.5 < x)"), NULL }
};
gtkW_menu_item arrange_menu [] =
{
#define STANDARD 0
{ "Standard", NULL },
{ N_("Standard"), NULL },
#define AVERAGE 1
{ "Use average value", NULL },
{ N_("Use average value"), NULL },
#define ANTILOG 2
{ "Use reverse value", NULL },
{ N_("Use reverse value"), NULL },
#define RAND_POWER0 3
{ "With random power (0,10)", NULL },
{ N_("With random power (0,10)"), NULL },
#define RAND_POWER1 4
{ "With random power (0,1)", NULL },
{ N_("With random power (0,1)"), NULL },
#define RAND_POWER2 5
{ "With gradient power (0,1)", NULL },
{ N_("With gradient power (0,1)"), NULL },
#define MULTIPLY_RANDOM0 6
{ "Multiply rand. value (0,1)", NULL },
{ N_("Multiply rand. value (0,1)"), NULL },
#define MULTIPLY_RANDOM1 7
{ "Multiply rand. value (0,2)", NULL },
{ N_("Multiply rand. value (0,2)"), NULL },
#define MULTIPLY_GRADIENT 8
{ "Multiply gradient (0,1)", NULL },
{ N_("Multiply gradient (0,1)"), NULL },
#define RAND_AND_P 9
{ "With p and random (0,1)", NULL },
{ N_("With p and random (0,1)"), NULL },
};
gtkW_menu_item initial_value_menu [] =
{
{ "All black", NULL }, /* 0 */
{ "All gray", NULL }, /* 1 */
{ "All white", NULL }, /* 2 */
{ "The first row of the image", NULL }, /* 3 */
{ "Continuous gradient", NULL }, /* 4 */
{ "Continuous grad. w/o gap", NULL }, /* 5 */
{ N_("All black"), NULL }, /* 0 */
{ N_("All gray"), NULL }, /* 1 */
{ N_("All white"), NULL }, /* 2 */
{ N_("The first row of the image"), NULL }, /* 3 */
{ N_("Continuous gradient"), NULL }, /* 4 */
{ N_("Continuous grad. w/o gap"), NULL }, /* 5 */
#define CML_INITIAL_RANDOM_INDEPENDENT 6
{ "Random, ch. independent", NULL },
{ N_("Random, ch. independent"), NULL },
#define CML_INITIAL_RANDOM_SHARED 7
{ "Random shared", NULL },
{ N_("Random shared"), NULL },
#define CML_INITIAL_RANDOM_FROM_SEED 8
{ "Randoms from seed" , NULL },
{ N_("Randoms from seed") , NULL },
#define CML_INITIAL_RANDOM_FROM_SEED_SHARED 9
{ "Randoms from seed (shared)" , NULL }
{ N_("Randoms from seed (shared)") , NULL }
} ;
#define CML_PARAM_NUM 15
@ -374,17 +377,17 @@ static ValueType VALS =
gtkW_menu_item channel_menu [] =
{
{ "Hue", (gpointer) &VALS.hue },
{ "Saturation", (gpointer) &VALS.sat },
{ "Value", (gpointer) &VALS.val },
{ N_("Hue"), (gpointer) &VALS.hue },
{ N_("Saturation"), (gpointer) &VALS.sat },
{ N_("Value"), (gpointer) &VALS.val },
};
gtkW_menu_item sload_menu [] =
{
{ "NULL", NULL },
{ "Hue", NULL },
{ "Saturation", NULL },
{ "Value", NULL },
{ N_("NULL"), NULL },
{ N_("Hue"), NULL },
{ N_("Saturation"), NULL },
{ N_("Value"), NULL },
};
static void query (void);
@ -485,9 +488,11 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure (PLUG_IN_NAME,
"Make an image of Coupled-Map Lattice",
"Make an image of Coupled-Map Lattice (CML). CML is a kind of Cellula Automata on continuous (value) domain. In RUN_NONINTERACTIVE, the name of a prameter file is passed as the 4th arg. You can control CML_explorer via parameter file.",
_("Make an image of Coupled-Map Lattice"),
_("Make an image of Coupled-Map Lattice (CML). CML is a kind of Cellula Automata on continuous (value) domain. In RUN_NONINTERACTIVE, the name of a prameter file is passed as the 4th arg. You can control CML_explorer via parameter file."),
/* Or do you want to call me with over 50 args? */
"Shuji Narazaki (narazaki@InetQ.or.jp); http://www.inetq.or.jp/~narazaki/TheGIMP/",
"Shuji Narazaki",
@ -1319,7 +1324,7 @@ DIALOG ()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
dlg = gtkW_dialog_new ("Coupled-Map-Lattice Explorer",
dlg = gtkW_dialog_new (_("Coupled-Map-Lattice Explorer"),
(GtkSignalFunc) OK_CALLBACK,
(GtkSignalFunc) gtkW_close_callback);
@ -1336,7 +1341,7 @@ DIALOG ()
GtkWidget *hseparator;
table = gtkW_table_new (hbox, 8, 1);
frame = gtkW_frame_new (NULL, "Preview");
frame = gtkW_frame_new (NULL, _("Preview"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1,
0, 0, 0, gtkW_border_width);
preview_box = gtkW_hbox_new (frame);
@ -1377,19 +1382,19 @@ DIALOG ()
GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
}
button = gtkW_table_add_button (table, "New seed", 0, 1, 2,
button = gtkW_table_add_button (table, _("New seed"), 0, 1, 2,
(GtkSignalFunc) CML_preview_update_callback,
&VALS);
random_sensitives[0].widget = button;
random_sensitives[0].logic = TRUE;
button = gtkW_table_add_button (table, "Fix seed", 0, 1, 3,
button = gtkW_table_add_button (table, _("Fix seed"), 0, 1, 3,
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[1].widget = button;
random_sensitives[1].logic = TRUE;
button = gtkW_table_add_button (table, "Random seed", 0, 1, 4,
button = gtkW_table_add_button (table, _("Random seed"), 0, 1, 4,
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[2].widget = button;
@ -1401,10 +1406,10 @@ DIALOG ()
GTK_FILL, GTK_FILL,
gtkW_border_width, 2 * gtkW_border_width);
gtkW_table_add_button (table, "Load", 0, 1, 6,
gtkW_table_add_button (table, _("Load"), 0, 1, 6,
(GtkSignalFunc) CML_load_from_file_callback,
&VALS);
gtkW_table_add_button (table, "Save", 0, 1, 7,
gtkW_table_add_button (table, _("Save"), 0, 1, 7,
(GtkSignalFunc) CML_save_to_file_callback,
&VALS);
}
@ -1421,21 +1426,21 @@ DIALOG ()
gtk_widget_show (notebook);
parent = NULL;
page = CML_dialog_sub_panel_new (parent, "Hue settings", &VALS.hue, 0);
page = CML_dialog_sub_panel_new (parent, _("Hue settings"), &VALS.hue, 0);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Hue"));
gtk_label_new (_("Hue")));
page = CML_dialog_sub_panel_new (parent, "Saturation settings", &VALS.sat, 1);
page = CML_dialog_sub_panel_new (parent, _("Saturation settings"), &VALS.sat, 1);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Saturation"));
gtk_label_new (_("Saturation")));
page = CML_dialog_sub_panel_new (parent, "Value (grayimage) settings", &VALS.val, 2);
page = CML_dialog_sub_panel_new (parent, _("Value (grayimage) settings"), &VALS.val, 2);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Value"));
gtk_label_new (_("Value")));
page = CML_dialog_advanced_panel_new (parent, "Advanced settings");
page = CML_dialog_advanced_panel_new (parent, _("Advanced settings"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Advanced"));
gtk_label_new (_("Advanced")));
{
GtkWidget *table;
@ -1447,26 +1452,26 @@ DIALOG ()
gint index;
gint sindex;
frame = gtkW_frame_new (NULL, "Other parameter settings");
frame = gtkW_frame_new (NULL, _("Other parameter settings"));
vbox = gtkW_vbox_new (frame);
table = gtkW_table_new (vbox, 6, 1);
index = 0;
subframe = gtkW_frame_new (NULL, "Channel independed parameters");
subframe = gtkW_frame_new (NULL, _("Channel independed parameters"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 3, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Initial value", 0, sindex++,
gtkW_table_add_menu (subtable, _("Initial value"), 0, sindex++,
(GtkSignalFunc) CML_initial_value_menu_update,
&VALS.initial_value,
initial_value_menu,
sizeof (initial_value_menu) / sizeof (initial_value_menu[0]),
&widget_pointers[3][0]);
gtkW_table_add_iscale_entry (subtable, "Zoom scale", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Zoom scale"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.scale,
1, 10, 1, &widget_pointers[3][1]);
gtkW_table_add_iscale_entry (subtable, "Start offset", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Start offset"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.start_offset,
@ -1486,11 +1491,11 @@ DIALOG ()
index++;
}
subframe = gtkW_frame_new (NULL, "Seed of random (only for \"from seed\" modes)");
subframe = gtkW_frame_new (NULL, _("Seed of random (only for \"from seed\" modes)"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 1, 2);
sindex = 0;
gtkW_table_add_iscale_entry (subtable, "Seed", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Seed"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.seed, 0, 1 << 15, 1,
@ -1500,14 +1505,14 @@ DIALOG ()
{
GtkWidget *button;
button = gtkW_vbox_add_button (box, "Switch to \"from seed\" with the last seed",
button = gtkW_vbox_add_button (box, _("Switch to \"from seed\" with the last seed"),
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[4].widget = button;
random_sensitives[4].logic = TRUE;
tooltips = gtkW_tooltips_new (frame);
gtk_tooltips_set_tip (tooltips, button, "\"Fix seed\" button is an alias of me.\nThe same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero.",NULL);
gtk_tooltips_set_tip (tooltips, button, _("\"Fix seed\" button is an alias of me.\nThe same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero."), NULL);
gtk_tooltips_enable (tooltips);
}
gtk_table_attach (GTK_TABLE (table), subframe, 0, 1, index, index + 1,
@ -1524,35 +1529,35 @@ DIALOG ()
index++;
}
label = gtk_label_new ("Others");
label = gtk_label_new (_("Others"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
}
{
GtkWidget *table, *subtable, *frame, *subframe, *box, *vbox;
int index, sindex;
frame = gtkW_frame_new (NULL, "Misc operations");
frame = gtkW_frame_new (NULL, _("Misc operations"));
vbox = gtkW_vbox_new (frame);
table = gtkW_table_new (vbox, 4, 1);
index = 0;
subframe = gtkW_frame_new (NULL, "Copy settings");
subframe = gtkW_frame_new (NULL, _("Copy settings"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 3, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Source ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Source ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&copy_source,
channel_menu,
sizeof (channel_menu) / sizeof (channel_menu[0]),
NULL);
gtkW_table_add_menu (subtable, "Destination ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Destination ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&copy_destination,
channel_menu,
sizeof (channel_menu) / sizeof (channel_menu[0]),
NULL);
gtkW_table_add_button (subtable, "Do copy parameters",
gtkW_table_add_button (subtable, _("Do copy parameters"),
0, 2, sindex++,
(GtkSignalFunc) CML_copy_parameters_callback,
&VALS);
@ -1570,17 +1575,17 @@ DIALOG ()
index++;
}
subframe = gtkW_frame_new (NULL, "Selective load settings");
subframe = gtkW_frame_new (NULL, _("Selective load settings"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 2, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Source ch. in file", 0, sindex++,
gtkW_table_add_menu (subtable, _("Source ch. in file"), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&selective_load_source,
sload_menu,
sizeof (sload_menu) / sizeof (sload_menu[0]),
NULL);
gtkW_table_add_menu (subtable, "Destination ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Destination ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&selective_load_destination,
sload_menu,
@ -1600,7 +1605,7 @@ DIALOG ()
index++;
}
label = gtk_label_new ("Misc ops.");
label = gtk_label_new (_("Misc ops."));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
}
}
@ -1636,82 +1641,82 @@ CML_dialog_sub_panel_new (GtkWidget *parent,
subframe = gtkW_frame_new (parent, name);
table = gtkW_table_new (subframe, 14, 2);
gtkW_table_add_menu (table, "Function type", 0, index,
gtkW_table_add_menu (table, _("Function type"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->function,
function_menu,
sizeof (function_menu) / sizeof (function_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_menu (table, "Composition", 0, index,
gtkW_table_add_menu (table, _("Composition"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->composition,
composition_menu,
sizeof (composition_menu) / sizeof (composition_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_menu (table, "Misc arrange", 0, index,
gtkW_table_add_menu (table, _("Misc arrange"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->arrange,
arrange_menu,
sizeof (arrange_menu) / sizeof (arrange_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_toggle (table, "Use cyclic range", 0, index,
gtkW_table_add_toggle (table, _("Use cyclic range"), 0, index,
(GtkSignalFunc) gtkW_toggle_update,
&param->cyclic_range,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Mod. rate", 0, index,
gtkW_table_add_dscale_entry (table, _("Mod. rate"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mod_rate,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Env. sensitivity", 0, index,
gtkW_table_add_dscale_entry (table, _("Env. sensitivity"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->env_sensitivity,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_iscale_entry (table, "Diffusion dist.", 0, index,
gtkW_table_add_iscale_entry (table, _("Diffusion dist."), 0, index,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&param->diffusion_dist,
2, 10, 1,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_iscale_entry (table, "# of subranges", 0, index,
gtkW_table_add_iscale_entry (table, _("# of subranges"), 0, index,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&param->range_num,
1, 10, 1,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "P(ower factor)", 0, index,
gtkW_table_add_dscale_entry (table, _("P(ower factor)"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->power,
0.0, 10.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Parameter k", 0, index,
gtkW_table_add_dscale_entry (table, _("Parameter k"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->parameter_k,
0.0, 10.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Range low", 0, index,
gtkW_table_add_dscale_entry (table, _("Range low"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->range_l,
0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Range high", 0, index,
gtkW_table_add_dscale_entry (table, _("Range high"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->range_h,
@ -1730,7 +1735,7 @@ CML_dialog_sub_panel_new (GtkWidget *parent,
chank = (gpointer *) g_malloc (2 *sizeof (gpointer));
chank[0] = (gpointer) channel_id;
chank[1] = (gpointer) param;
gtkW_table_add_button (table, "Plot the graph of the settings",
gtkW_table_add_button (table, _("Plot the graph of the settings"),
0, 2, index++,
(GtkSignalFunc) function_graph_new, chank);
@ -1747,7 +1752,7 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name)
gint index = 0;
gint widget_offset = 12;
gint channel_id;
gchar *ch_name[] = { "Hue", "Saturation", "Value" };
gchar *ch_name[] = { N_("Hue"), N_("Saturation"), N_("Value") };
CML_PARAM *param;
frame = gtkW_frame_new (parent, name);
@ -1757,28 +1762,28 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name)
{
param = (CML_PARAM *)&VALS + channel_id;
subframe = gtkW_frame_new (NULL, ch_name[channel_id]);
subframe = gtkW_frame_new (NULL, gettext(ch_name[channel_id]));
gtk_table_attach (GTK_TABLE (table), subframe,
0, 1, channel_id, channel_id + 1,
GTK_FILL, GTK_FILL, 0, 0);
subtable = gtkW_table_new (subframe, 3, 2);
index = 0;
gtkW_table_add_dscale_entry (subtable, "Ch. sensitivity", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Ch. sensitivity"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->ch_sensitivity,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index + widget_offset]);
index++;
gtkW_table_add_dscale_entry (subtable, "Mutation rate", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Mutation rate"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mutation_rate,
0, 1.0, 0.01,
&widget_pointers[channel_id][index + widget_offset]);
index++;
gtkW_table_add_dscale_entry (subtable, "Mutation dist.", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Mutation dist."), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mutation_dist,
@ -1807,12 +1812,12 @@ function_graph_new (GtkWidget *widget, gpointer data)
CML_PARAM *param = (CML_PARAM *) *((gpointer *)data + 1);
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Graph of the current settings");
gtk_window_set_title (GTK_WINDOW (dlg), _("Graph of the current settings"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) gtkW_close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -1822,7 +1827,7 @@ function_graph_new (GtkWidget *widget, gpointer data)
gtk_widget_grab_default (button);
gtk_widget_show (button);
frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, "The Graph");
frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, _("The Graph"));
vbox = gtkW_vbox_new (frame);
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
@ -1914,7 +1919,7 @@ CML_copy_parameters_callback (GtkWidget *widget, gpointer data)
if (copy_source == copy_destination)
{
gtkW_message_dialog (TRUE, "Warning: the source and the destination are the same channel.");
gtkW_message_dialog (TRUE, _("Warning: the source and the destination are the same channel."));
gdk_flush ();
return;
}
@ -2002,7 +2007,7 @@ CML_dialog_new (char * name,
(GtkSignalFunc) close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("Execute");
button = gtk_button_new_with_label (_("Execute"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) execute_callback, dlg);
@ -2011,7 +2016,7 @@ CML_dialog_new (char * name,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Execute and Exit");
button = gtk_button_new_with_label (_("Execute and Exit"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) ok_callback, dlg);
@ -2019,7 +2024,7 @@ CML_dialog_new (char * name,
TRUE, TRUE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Exit");
button = gtk_button_new_with_label (_("Exit"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2037,7 +2042,7 @@ CML_save_to_file_callback (GtkWidget *widget, gpointer client_data)
{
GtkWidget *filesel;
filesel = gtk_file_selection_new ("Save parameters to");
filesel = gtk_file_selection_new (_("Save parameters to"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
@ -2100,7 +2105,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
{
gchar buffer[CML_LINE_SIZE];
sprintf (buffer, "Error: could not open \"%s\"", filename);
sprintf (buffer, _("Error: could not open \"%s\""), filename);
gtkW_message_dialog (TRUE, buffer);
return;
}
@ -2165,14 +2170,14 @@ force_overwrite (char *filename)
gchar buffer[CML_LINE_SIZE];
gint tmp;
dlg = gtkW_dialog_new ("CML file operation warning",
dlg = gtkW_dialog_new (_("CML file operation warning"),
(GtkSignalFunc) CML_overwrite_ok_callback,
(GtkSignalFunc) gtkW_close_callback);
table = gtkW_table_new (NULL, 1, 1);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
sprintf (buffer, "%s exists, overwrite?", filename);
sprintf (buffer, _("%s exists, overwrite?"), filename);
label = gtk_label_new (buffer);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND,
0, 0, 0);
@ -2215,9 +2220,9 @@ CML_load_from_file_callback (GtkWidget *widget, gpointer client_data)
GtkWidget *filesel;
if ((selective_load_source == 0) || (selective_load_destination == 0))
filesel = gtk_file_selection_new ("Load parameters from");
filesel = gtk_file_selection_new (_("Load parameters from"));
else
filesel = gtk_file_selection_new ("Selective load from");
filesel = gtk_file_selection_new (_("Selective load from"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
@ -2293,7 +2298,7 @@ CML_load_parameter_file (gchar *filename, gint interactive_mode)
if (interactive_mode)
{
sprintf (buffer, "Error: could not open \"%s\"", filename);
sprintf (buffer, _("Error: could not open \"%s\""), filename);
gtkW_message_dialog (TRUE, buffer);
}
return FALSE;
@ -2316,16 +2321,16 @@ CML_load_parameter_file (gchar *filename, gint interactive_mode)
if (version == 0)
{
if (interactive_mode)
gtkW_message_dialog (TRUE, "Error: it's not CML parameter file.");
gtkW_message_dialog (TRUE, _("Error: it's not CML parameter file."));
fclose(file);
return FALSE;
}
if (interactive_mode)
{
if (version < PARAM_FILE_FORMAT_VERSION)
gtkW_message_dialog (TRUE, "Warning: it's an old format file.");
gtkW_message_dialog (TRUE, _("Warning: it's an old format file."));
if (PARAM_FILE_FORMAT_VERSION < version)
gtkW_message_dialog (TRUE, "Warning: Hmmm, it's a parameter file for newer CML_explorer than me.");
gtkW_message_dialog (TRUE, _("Warning: Hmmm, it's a parameter file for newer CML_explorer than me."));
}
for (channel_id = 0; flag && (channel_id < 3); channel_id++)
{
@ -2673,7 +2678,7 @@ gtkW_dialog_new (gchar *name,
(GtkSignalFunc) close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) ok_callback, dlg);
@ -2682,7 +2687,7 @@ gtkW_dialog_new (gchar *name,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2769,7 +2774,7 @@ gtkW_message_dialog_new (gchar * name)
(GtkSignalFunc) gtkW_close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2972,7 +2977,7 @@ gtkW_table_add_menu (GtkWidget *table,
buffer[0] = (gint *) ((*val == i) ? TRUE : FALSE); /* for trick */
buffer[1] = val; /* for pointer */
buffer[2] = (gint *) i; /* for value */
menuitem = gtk_menu_item_new_with_label (item[i].name);
menuitem = gtk_menu_item_new_with_label (gettext(item[i].name));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) menu_update,

3
plug-ins/CML_explorer/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

3
plug-ins/Lighting/Makefile.am
View File

@ -35,6 +35,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \

12
plug-ins/Lighting/lighting_main.c
View File

@ -166,13 +166,15 @@ static void query(void)
static gint nargs = sizeof (args) / sizeof (args[0]);
static gint nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_lighting",
"Apply various lighting effects to an image",
"No help yet",
_("Apply various lighting effects to an image"),
_("No help yet"),
"Tom Bech & Federico Mena Quintero",
"Tom Bech & Federico Mena Quintero",
"Version 0.2.0, March 15 1998",
"<Image>/Filters/Light Effects/Lighting Effects",
_("<Image>/Filters/Light Effects/Lighting Effects"),
"RGB*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -190,6 +192,8 @@ static void run(gchar *name,
GRunModeType run_mode;
GStatusType status = STATUS_SUCCESS;
INIT_I18N();
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
@ -334,7 +338,7 @@ void lighting_interactive(GDrawable *drawable)
void lighting_noninteractive(GDrawable *drawable)
{
printf("Noninteractive not yet implemented! Sorry.\n");
fprintf(stderr, "Noninteractive not yet implemented! Sorry.\n");
}
MAIN ()

4
plug-ins/Lighting/lighting_main.h
View File

@ -14,6 +14,10 @@
#include "lighting_apply.h"
#include "lighting_preview.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Defines and stuff */
/* ================= */

170
plug-ins/Lighting/lighting_ui.c
View File

@ -31,26 +31,26 @@ GckScaleValues sample_scale_vals = {128,3.0,1.0,6.0,1.0,1.0,1.0,GTK_UPDATE_CONTI
gchar *light_labels[] =
{
"Point light",
"Directional light",
"Spot light",
"No light",
N_("Point light"),
N_("Directional light"),
N_("Spot light"),
N_("No light"),
NULL
};
gchar *maptype_labels[] =
{
"From image",
"Waves",
N_("From image"),
N_("Waves"),
NULL
};
gchar *curvetype_labels[] =
{
"Linear",
"Logarithmic",
"Sinusoidal",
"Spherical",
N_("Linear"),
N_("Logarithmic"),
N_("Sinusoidal"),
N_("Spherical"),
NULL
};
@ -566,34 +566,34 @@ GtkWidget *create_options_page(void)
page = gck_vbox_new(NULL,FALSE,FALSE,FALSE,0,0,0);
frame=gck_frame_new("General options",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("General options"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(frame,FALSE,FALSE,FALSE,0,5,5);
togglebump=gck_checkbutton_new("Use bump mapping",vbox,mapvals.bump_mapped,
togglebump=gck_checkbutton_new(_("Use bump mapping"),vbox,mapvals.bump_mapped,
(GtkSignalFunc)togglebump_update);
toggleenvironment=gck_checkbutton_new("Use environment mapping",vbox,mapvals.env_mapped,
toggleenvironment=gck_checkbutton_new(_("Use environment mapping"),vbox,mapvals.env_mapped,
(GtkSignalFunc)toggleenvironment_update);
/* togglerefraction=gck_checkbutton_new("Use refraction mapping",vbox,mapvals.ref_mapped,
(GtkSignalFunc)togglerefraction_update); */
toggletrans=gck_checkbutton_new("Transparent background",vbox,mapvals.transparent_background,
toggletrans=gck_checkbutton_new(_("Transparent background"),vbox,mapvals.transparent_background,
(GtkSignalFunc)toggletrans_update);
toggleimage=gck_checkbutton_new("Create new image",vbox,mapvals.create_new_image,
toggleimage=gck_checkbutton_new(_("Create new image"),vbox,mapvals.create_new_image,
(GtkSignalFunc)toggle_update);
togglequality=gck_checkbutton_new("High preview quality",vbox,mapvals.previewquality,
togglequality=gck_checkbutton_new(_("High preview quality"),vbox,mapvals.previewquality,
(GtkSignalFunc)togglequality_update);
toggletips=gck_checkbutton_new("Enable tooltips",vbox,mapvals.tooltips_enabled,
toggletips=gck_checkbutton_new(_("Enable tooltips"),vbox,mapvals.tooltips_enabled,
(GtkSignalFunc)toggletips_update);
gtk_tooltips_set_tip(tooltips,togglebump,"Enable/disable bump-mapping (image depth)",NULL);
gtk_tooltips_set_tip(tooltips,toggleenvironment,"Enable/disable environment mapping (reflection)",NULL);
gtk_tooltips_set_tip(tooltips,togglebump,_("Enable/disable bump-mapping (image depth)"),NULL);
gtk_tooltips_set_tip(tooltips,toggleenvironment,_("Enable/disable environment mapping (reflection)"),NULL);
/* gtk_tooltips_set_tips(tooltips,togglerefraction,"Enable/disable refractive layer"); */
gtk_tooltips_set_tip(tooltips,toggletrans,"Make destination image transparent where bump height is zero",NULL);
gtk_tooltips_set_tip(tooltips,toggleimage,"Create a new image when applying filter",NULL);
gtk_tooltips_set_tip(tooltips,togglequality,"Enable/disable high quality previews",NULL);
gtk_tooltips_set_tip(tooltips,toggletips,"Enable/disable tooltip messages",NULL);
gtk_tooltips_set_tip(tooltips,toggletrans, _("Make destination image transparent where bump height is zero"),NULL);
gtk_tooltips_set_tip(tooltips,toggleimage, _("Create a new image when applying filter"),NULL);
gtk_tooltips_set_tip(tooltips,togglequality, _("Enable/disable high quality previews"),NULL);
gtk_tooltips_set_tip(tooltips,toggletips, _("Enable/disable tooltip messages"),NULL);
gtk_object_set_data(GTK_OBJECT(togglebump),"ValuePtr",(gpointer)&mapvals.bump_mapped);
gtk_object_set_data(GTK_OBJECT(toggleenvironment),"ValuePtr",(gpointer)&mapvals.env_mapped);
gtk_object_set_data(GTK_OBJECT(togglebump), "ValuePtr",(gpointer)&mapvals.bump_mapped);
gtk_object_set_data(GTK_OBJECT(toggleenvironment), "ValuePtr",(gpointer)&mapvals.env_mapped);
/* gtk_object_set_data(GTK_OBJECT(togglerefraction),"ValuePtr",(gpointer)&mapvals.ref_mapped); */
gtk_object_set_data(GTK_OBJECT(toggletrans),"ValuePtr",(gpointer)&mapvals.transparent_background);
gtk_object_set_data(GTK_OBJECT(toggleimage),"ValuePtr",(gpointer)&mapvals.create_new_image);
@ -609,13 +609,13 @@ GtkWidget *create_options_page(void)
gtk_widget_show(vbox);
gtk_widget_show(frame);
frame=gck_frame_new("Antialiasing options",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("Antialiasing options"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(frame,FALSE,FALSE,FALSE,5,5,5);
toggleanti=gck_checkbutton_new("Enable antialiasing",vbox,mapvals.antialiasing,
toggleanti=gck_checkbutton_new(_("Enable antialiasing"),vbox,mapvals.antialiasing,
(GtkSignalFunc)toggleanti_update);
gtk_object_set_data(GTK_OBJECT(toggleanti),"ValuePtr",(gpointer)&mapvals.antialiasing);
gtk_tooltips_set_tip(tooltips,toggleanti,"Enable/disable jagged edges removal (antialiasing)",NULL);
gtk_tooltips_set_tip(tooltips,toggleanti,_("Enable/disable jagged edges removal (antialiasing)"),NULL);
hbox=gck_hbox_new(vbox,FALSE,TRUE,TRUE,0,0,0);
@ -625,12 +625,12 @@ GtkWidget *create_options_page(void)
vbox=gck_vbox_new(hbox,TRUE,FALSE,TRUE,0,0,0);
frame=gck_frame_new(NULL,vbox,GTK_SHADOW_NONE,TRUE,TRUE,0,0);
label=gck_label_aligned_new("Depth:",frame,GCK_ALIGN_RIGHT,GCK_ALIGN_BOTTOM);
label=gck_label_aligned_new(_("Depth:"),frame,GCK_ALIGN_RIGHT,GCK_ALIGN_BOTTOM);
gtk_widget_show(label);
gtk_widget_show(frame);
frame=gck_frame_new(NULL,vbox,GTK_SHADOW_NONE,TRUE,TRUE,0,0);
label=gck_label_aligned_new("Treshold:",frame,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label=gck_label_aligned_new(_("Threshold:"),frame,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
gtk_widget_show(label);
gtk_widget_show(vbox);
gtk_widget_show(frame);
@ -642,8 +642,8 @@ GtkWidget *create_options_page(void)
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.max_depth);
gtk_object_set_data(GTK_OBJECT(widget2),"ValuePtr",(gpointer)&mapvals.pixel_treshold);
gtk_tooltips_set_tip(tooltips,widget1,"Antialiasing quality. Higher is better, but slower",NULL);
gtk_tooltips_set_tip(tooltips,widget2,"Stop when pixel differences are smaller than this value",NULL);
gtk_tooltips_set_tip(tooltips,widget1,_("Antialiasing quality. Higher is better, but slower"),NULL);
gtk_tooltips_set_tip(tooltips,widget2,_("Stop when pixel differences are smaller than this value"),NULL);
gtk_widget_show(widget1);
gtk_widget_show(widget2);
@ -666,39 +666,39 @@ GtkWidget *create_light_page(void)
page=gtk_vbox_new(FALSE,0);
frame=gck_frame_new("Light settings",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("Light settings"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(frame,FALSE,TRUE,TRUE,5,0,5);
gck_auto_show(TRUE);
widget1=gck_option_menu_new("Lightsource type:",vbox,TRUE,TRUE,0,
widget1=gck_option_menu_new(_("Lightsource type:"),vbox,TRUE,TRUE,0,
light_labels,(GtkSignalFunc)lightmenu_callback, NULL);
gtk_option_menu_set_history(GTK_OPTION_MENU(widget1),mapvals.lightsource.type);
gck_auto_show(FALSE);
widget2=gck_pushbutton_new("Lightsource color",vbox,TRUE,FALSE,0,
widget2=gck_pushbutton_new(_("Lightsource color"),vbox,TRUE,FALSE,0,
(GtkSignalFunc)light_color_callback);
gtk_widget_show(widget2);
gtk_widget_show(vbox);
gtk_widget_show(frame);
gtk_tooltips_set_tip(tooltips,widget1,"Type of light source to apply",NULL);
gtk_tooltips_set_tip(tooltips,widget2,"Set light source color (white is default)",NULL);
gtk_tooltips_set_tip(tooltips,widget1,_("Type of light source to apply"),NULL);
gtk_tooltips_set_tip(tooltips,widget2,_("Set light source color (white is default)"),NULL);
pointlightwid=gck_frame_new("Position",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
pointlightwid=gck_frame_new(_("Position"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(pointlightwid,FALSE,FALSE,FALSE,5,0,5);
xentry=gck_entryfield_new("X:",vbox,mapvals.lightsource.position.x,(GtkSignalFunc)entry_update);
yentry=gck_entryfield_new("Y:",vbox,mapvals.lightsource.position.y,(GtkSignalFunc)entry_update);
zentry=gck_entryfield_new("Z:",vbox,mapvals.lightsource.position.z,(GtkSignalFunc)entry_update);
xentry=gck_entryfield_new(_("X:"),vbox,mapvals.lightsource.position.x,(GtkSignalFunc)entry_update);
yentry=gck_entryfield_new(_("Y:"),vbox,mapvals.lightsource.position.y,(GtkSignalFunc)entry_update);
zentry=gck_entryfield_new(_("Z:"),vbox,mapvals.lightsource.position.z,(GtkSignalFunc)entry_update);
gtk_object_set_data(GTK_OBJECT(xentry),"ValuePtr",(gpointer)&mapvals.lightsource.position.x);
gtk_object_set_data(GTK_OBJECT(yentry),"ValuePtr",(gpointer)&mapvals.lightsource.position.y);
gtk_object_set_data(GTK_OBJECT(zentry),"ValuePtr",(gpointer)&mapvals.lightsource.position.z);
gtk_tooltips_set_tip(tooltips,xentry,"Light source X position in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,yentry,"Light source Y position in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,zentry,"Light source Z position in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,xentry,_("Light source X position in XYZ space"),NULL);
gtk_tooltips_set_tip(tooltips,yentry,_("Light source Y position in XYZ space"),NULL);
gtk_tooltips_set_tip(tooltips,zentry,_("Light source Z position in XYZ space"),NULL);
gtk_widget_show(xentry);
gtk_widget_show(yentry);
@ -707,16 +707,16 @@ GtkWidget *create_light_page(void)
gtk_widget_show(frame);
gtk_widget_show(pointlightwid);
dirlightwid=gck_frame_new("Direction vector",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
dirlightwid=gck_frame_new(_("Direction vector"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(dirlightwid,FALSE,FALSE,FALSE,5,0,5);
widget1=gck_entryfield_new("X:",vbox,mapvals.lightsource.direction.x,(GtkSignalFunc)entry_update);
widget2=gck_entryfield_new("Y:",vbox,mapvals.lightsource.direction.y,(GtkSignalFunc)entry_update);
widget3=gck_entryfield_new("Z:",vbox,mapvals.lightsource.direction.z,(GtkSignalFunc)entry_update);
widget1=gck_entryfield_new(_("X:"),vbox,mapvals.lightsource.direction.x,(GtkSignalFunc)entry_update);
widget2=gck_entryfield_new(_("Y:"),vbox,mapvals.lightsource.direction.y,(GtkSignalFunc)entry_update);
widget3=gck_entryfield_new(_("Z:"),vbox,mapvals.lightsource.direction.z,(GtkSignalFunc)entry_update);
gtk_tooltips_set_tip(tooltips,widget1,"Light source X direction in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,widget2,"Light source Y direction in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,widget3,"Light source Z direction in XYZ space",NULL);
gtk_tooltips_set_tip(tooltips,widget1,_("Light source X direction in XYZ space"),NULL);
gtk_tooltips_set_tip(tooltips,widget2,_("Light source Y direction in XYZ space"),NULL);
gtk_tooltips_set_tip(tooltips,widget3,_("Light source Z direction in XYZ space"),NULL);
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.lightsource.direction.x);
gtk_object_set_data(GTK_OBJECT(widget2),"ValuePtr",(gpointer)&mapvals.lightsource.direction.y);
@ -748,13 +748,13 @@ GtkWidget *create_material_page(void)
page=gtk_vbox_new(FALSE,0);
frame=gck_frame_new("Intensity levels",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("Intensity levels"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
table=gtk_table_new(2,4,FALSE);
gtk_container_add(GTK_CONTAINER(frame),table);
label1=gck_label_aligned_new("Ambient:",NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label2=gck_label_aligned_new("Diffuse:",NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label1=gck_label_aligned_new(_("Ambient:"),NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label2=gck_label_aligned_new(_("Diffuse:"),NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
gtk_table_attach(GTK_TABLE(table),label1,0,1,0,1, 0,0,0,0);
gtk_table_attach(GTK_TABLE(table),label2,0,1,1,2, 0,0,0,0);
@ -794,20 +794,20 @@ GtkWidget *create_material_page(void)
gtk_widget_show(table);
gtk_widget_show(frame);
gtk_tooltips_set_tip(tooltips,widget1,"Amount of original color to show where no direct light falls",NULL);
gtk_tooltips_set_tip(tooltips,widget2,"Intensity of original color when lit by a light source",NULL);
gtk_tooltips_set_tip(tooltips,widget1,_("Amount of original color to show where no direct light falls"),NULL);
gtk_tooltips_set_tip(tooltips,widget2,_("Intensity of original color when lit by a light source"),NULL);
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.material.ambient_int);
gtk_object_set_data(GTK_OBJECT(widget2),"ValuePtr",(gpointer)&mapvals.material.diffuse_int);
frame=gck_frame_new("Reflectivity",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("Reflectivity"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
table=gtk_table_new(3,4,FALSE);
gtk_container_add(GTK_CONTAINER(frame),table);
label1=gck_label_aligned_new("Diffuse:",NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label2=gck_label_aligned_new("Specular:",NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label3=gck_label_aligned_new("Hightlight:",NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label1=gck_label_aligned_new(_("Diffuse:"),NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label2=gck_label_aligned_new(_("Specular:"),NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
label3=gck_label_aligned_new(_("Hightlight:"),NULL,GCK_ALIGN_RIGHT,GCK_ALIGN_CENTERED);
gtk_table_attach(GTK_TABLE(table),label1,0,1,0,1, 0,0,0,0);
gtk_table_attach(GTK_TABLE(table),label2,0,1,1,2, 0,0,0,0);
@ -821,9 +821,9 @@ GtkWidget *create_material_page(void)
gtk_table_attach(GTK_TABLE(table),widget2,2,3,1,2, GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL, 0,0);
gtk_table_attach(GTK_TABLE(table),widget3,2,3,2,3, GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL, 0,0);
gtk_tooltips_set_tip(tooltips,widget1,"Higher values makes the object reflect more light (appear lighter)",NULL);
gtk_tooltips_set_tip(tooltips,widget2,"Controls how intense the highlights will be",NULL);
gtk_tooltips_set_tip(tooltips,widget3,"Higher values makes the highlights more focused",NULL);
gtk_tooltips_set_tip(tooltips,widget1,_("Higher values makes the object reflect more light (appear lighter)"),NULL);
gtk_tooltips_set_tip(tooltips,widget2,_("Controls how intense the highlights will be"),NULL);
gtk_tooltips_set_tip(tooltips,widget3,_("Higher values makes the highlights more focused"),NULL);
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.material.diffuse_ref);
gtk_object_set_data(GTK_OBJECT(widget2),"ValuePtr",(gpointer)&mapvals.material.specular_ref);
@ -885,13 +885,13 @@ GtkWidget *create_bump_page(void)
page=gtk_vbox_new(FALSE,0);
frame=gck_frame_new("Bumpmap settings",page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
frame=gck_frame_new(_("Bumpmap settings"),page,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(frame,FALSE,TRUE,TRUE,5,0,5);
imagewid=gck_vbox_new(vbox,FALSE,TRUE,TRUE,5,0,5);
widget1=gck_hbox_new(imagewid,FALSE,TRUE,TRUE,5,0,3);
label = gck_label_new("Bumpmap image:",widget1);
label = gck_label_new(_("Bumpmap image:"),widget1);
gtk_widget_show(label);
gtk_widget_show(widget1);
@ -910,9 +910,9 @@ GtkWidget *create_bump_page(void)
gtk_option_menu_set_history(GTK_OPTION_MENU(widget1),mapvals.bumpmaptype);
gck_auto_show(FALSE);
widget1=gck_entryfield_new("Minimum height:",imagewid,mapvals.bumpmin,
widget1=gck_entryfield_new(_("Minimum height:"),imagewid,mapvals.bumpmin,
(GtkSignalFunc)entry_update);
widget2=gck_entryfield_new("Maximum height:",imagewid,mapvals.bumpmax,
widget2=gck_entryfield_new(_("Maximum height:"),imagewid,mapvals.bumpmax,
(GtkSignalFunc)entry_update);
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.bumpmin);
@ -920,7 +920,7 @@ GtkWidget *create_bump_page(void)
gtk_widget_show(widget1);
gtk_widget_show(widget2);
widget1=gck_checkbutton_new("Autostretch to fit value range",imagewid,mapvals.bumpstretch,
widget1=gck_checkbutton_new(_("Autostretch to fit value range"),imagewid,mapvals.bumpstretch,
(GtkSignalFunc)togglestretch_update);
gtk_object_set_data(GTK_OBJECT(widget1),"ValuePtr",(gpointer)&mapvals.bumpstretch);
gtk_widget_show(widget1);
@ -943,14 +943,14 @@ GtkWidget *create_environment_page(void)
page=gck_vbox_new(NULL,FALSE,FALSE,FALSE,0,0,0);
frame=gck_frame_new("Environment settings",page,
frame=gck_frame_new(_("Environment settings"),page,
GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,5);
vbox=gck_vbox_new(frame,FALSE,TRUE,TRUE,5,0,5);
imagewid=gck_vbox_new(vbox,FALSE,TRUE,TRUE,5,0,5);
widget1=gck_hbox_new(imagewid,FALSE,TRUE,TRUE,5,0,3);
gck_label_new("Environment image:",widget1);
gck_label_new(_("Environment image:"),widget1);
widget2=gtk_option_menu_new();
gtk_box_pack_end(GTK_BOX(widget1),widget2,TRUE,TRUE,0);
@ -984,19 +984,19 @@ void create_main_notebook(GtkWidget *container)
gtk_container_add(GTK_CONTAINER(container),GTK_WIDGET(options_note_book));
page = create_options_page();
label=gtk_label_new("Options");
label=gtk_label_new(_("Options"));
gtk_widget_show(label);
gtk_notebook_append_page(options_note_book,page,label);
page = create_light_page();
label=gtk_label_new("Light");
label=gtk_label_new(_("Light"));
gtk_widget_show(label);
gtk_notebook_append_page(options_note_book,page,label);
page = create_material_page();
label=gtk_label_new("Material");
label=gtk_label_new(_("Material"));
gtk_widget_show(label);
gtk_notebook_append_page(options_note_book,page,label);
@ -1004,7 +1004,7 @@ void create_main_notebook(GtkWidget *container)
if (mapvals.bump_mapped==TRUE)
{
bump_page = create_bump_page();
bump_label=gtk_label_new("Bump");
bump_label=gtk_label_new(_("Bump"));
gtk_widget_show(bump_label);
bump_page_pos = g_list_length(options_note_book->children);
gtk_notebook_append_page(options_note_book,bump_page,bump_label);
@ -1013,7 +1013,7 @@ void create_main_notebook(GtkWidget *container)
if (mapvals.env_mapped==TRUE)
{
env_page = create_environment_page();
env_label=gtk_label_new("Env");
env_label=gtk_label_new(_("Env"));
gtk_widget_show(env_label);
env_page_pos = g_list_length(options_note_book->children);
gtk_notebook_append_page(options_note_book,env_page,env_label);
@ -1034,7 +1034,7 @@ void create_main_dialog(void)
GtkWidget *main_vbox,*main_workbox,*actionbox,*workbox1,*workbox1b,*workbox2;
GtkWidget *frame,*applybutton,*cancelbutton,*helpbutton,*hbox,*wid;
appwin = gck_application_window_new("Lighting effects");
appwin = gck_application_window_new(_("Lighting effects"));
gtk_widget_realize(appwin->widget);
tooltips=gtk_tooltips_new();
@ -1058,9 +1058,9 @@ void create_main_dialog(void)
/* Add Ok, Cancel and Help buttons to the action area */
/* ================================================== */
applybutton=gck_pushbutton_new("Apply",actionbox,FALSE,FALSE,5,(GtkSignalFunc)apply_callback);
cancelbutton=gck_pushbutton_new("Cancel",actionbox,FALSE,FALSE,5,(GtkSignalFunc)exit_callback);
helpbutton=gck_pushbutton_new("Help",actionbox,FALSE,FALSE,5,NULL);
applybutton=gck_pushbutton_new(_("Apply"),actionbox,FALSE,FALSE,5,(GtkSignalFunc)apply_callback);
cancelbutton=gck_pushbutton_new(_("Cancel"),actionbox,FALSE,FALSE,5,(GtkSignalFunc)exit_callback);
helpbutton=gck_pushbutton_new(_("Help"),actionbox,FALSE,FALSE,5,NULL);
GTK_WIDGET_SET_FLAGS (applybutton, GTK_CAN_DEFAULT);
GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
@ -1069,8 +1069,8 @@ void create_main_dialog(void)
gtk_widget_grab_default (applybutton);
gtk_widget_set_sensitive(helpbutton,FALSE);
gtk_tooltips_set_tip(tooltips,applybutton,"Apply filter with current settings",NULL);
gtk_tooltips_set_tip(tooltips,cancelbutton,"Close filter without doing anything",NULL);
gtk_tooltips_set_tip(tooltips,applybutton,_("Apply filter with current settings"),NULL);
gtk_tooltips_set_tip(tooltips,cancelbutton,_("Close filter without doing anything"),NULL);
/* Split the workarea in two */
/* ========================= */
@ -1090,13 +1090,13 @@ void create_main_dialog(void)
workbox1b=gck_vbox_new(workbox1,FALSE,FALSE,FALSE,0,0,0);
hbox=gck_hbox_new(workbox1b,FALSE,FALSE,FALSE,5,0,0);
wid=gck_pushbutton_new(" Preview! ",hbox,FALSE,FALSE,0,(GtkSignalFunc)preview_callback);
gtk_tooltips_set_tip(tooltips,wid,"Recompute preview image",NULL);
wid=gck_pushbutton_new(_(" Preview! "),hbox,FALSE,FALSE,0,(GtkSignalFunc)preview_callback);
gtk_tooltips_set_tip(tooltips,wid,_("Recompute preview image"),NULL);
hbox=gck_hbox_new(hbox,TRUE,FALSE,FALSE,0,0,0);
wid=gck_pushbutton_new(" + ",hbox,FALSE,FALSE,0,(GtkSignalFunc)zoomin_callback);
gtk_tooltips_set_tip(tooltips,wid,"Zoom in (make image bigger)",NULL);
gtk_tooltips_set_tip(tooltips,wid,_("Zoom in (make image bigger)"),NULL);
wid=gck_pushbutton_new(" - ",hbox,FALSE,FALSE,0,(GtkSignalFunc)zoomout_callback);
gtk_tooltips_set_tip(tooltips,wid,"Zoom out (make image smaller)",NULL);
gtk_tooltips_set_tip(tooltips,wid,_("Zoom out (make image smaller)"),NULL);
create_main_notebook(workbox2);

3
plug-ins/apply_lens/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

33
plug-ins/apply_lens/apply_lens.c
View File

@ -58,6 +58,9 @@
#include "libgimp/gimp.h"
#include "gtk/gtk.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
@ -127,13 +130,15 @@ query(void)
static int nargs = sizeof(args)/ sizeof(args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure("plug_in_applylens",
"Apply a lens effect",
"This plug-in uses Snell's law to draw an ellipsoid lens over the image",
_("Apply a lens effect"),
_("This plug-in uses Snell's law to draw an ellipsoid lens over the image"),
"Morten Eriksen",
"Morten Eriksen",
"1997",
"<Image>/Filters/Glass Effects/Apply Lens",
_("<Image>/Filters/Glass Effects/Apply Lens"),
"RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -152,6 +157,8 @@ run(char *name,
GRunModeType run_mode;
GStatusType status = STATUS_SUCCESS;
INIT_I18N();
run_mode = param[0].data.d_int32;
values[0].type = PARAM_STATUS;
@ -190,7 +197,7 @@ run(char *name,
}
gimp_tile_cache_ntiles(2 *(drawable->width / gimp_tile_width() + 1));
gimp_progress_init("Applying lens...");
gimp_progress_init(_("Applying lens..."));
drawlens(drawable);
if(run_mode != RUN_NONINTERACTIVE)
@ -404,13 +411,13 @@ lens_dialog(GDrawable *drawable)
gtk_rc_parse(gimp_gtkrc());
dlg = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dlg), "Lens effect");
gtk_window_set_title(GTK_WINDOW(dlg), _("Lens effect"));
gtk_window_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
(GtkSignalFunc)lens_close_callback,
NULL);
button = gtk_button_new_with_label("OK");
button = gtk_button_new_with_label(_("OK"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc)lens_ok_callback,
@ -420,7 +427,7 @@ lens_dialog(GDrawable *drawable)
gtk_widget_grab_default(button);
gtk_widget_show(button);
button = gtk_button_new_with_label("Cancel");
button = gtk_button_new_with_label(_("Cancel"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
(GtkSignalFunc)gtk_widget_destroy,
@ -429,7 +436,7 @@ lens_dialog(GDrawable *drawable)
button, TRUE, TRUE, 0);
gtk_widget_show(button);
frame = gtk_frame_new("Parameter Settings");
frame = gtk_frame_new(_("Parameter Settings"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width(GTK_CONTAINER(frame), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 0);
@ -438,7 +445,7 @@ lens_dialog(GDrawable *drawable)
gtk_container_add(GTK_CONTAINER(frame), vbox);
toggle = gtk_radio_button_new_with_label(group,
"Keep original surroundings");
_("Keep original surroundings"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -451,8 +458,8 @@ lens_dialog(GDrawable *drawable)
gtk_radio_button_new_with_label(group,
drawtype == INDEXEDA_IMAGE ||
drawtype == INDEXED_IMAGE ?
"Set surroundings to index 0" :
"Set surroundings to background color");
_("Set surroundings to index 0") :
_("Set surroundings to background color"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -465,7 +472,7 @@ lens_dialog(GDrawable *drawable)
(drawtype == GRAYA_IMAGE) ||
(drawtype == RGBA_IMAGE)) {
toggle = gtk_radio_button_new_with_label(group,
"Make surroundings transparent");
_("Make surroundings transparent"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -480,7 +487,7 @@ lens_dialog(GDrawable *drawable)
hbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
label = gtk_label_new("Lens refraction index: ");
label = gtk_label_new(_("Lens refraction index: "));
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0);
gtk_widget_show(label);

3
plug-ins/autostretch_hsv/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GLIB_LIBS)

17
plug-ins/autostretch_hsv/autostretch_hsv.c
View File

@ -34,6 +34,9 @@
#include <stdio.h>
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Declare local functions.
*/
static void query (void);
@ -73,13 +76,15 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_autostretch_hsv",
"Automatically stretch the contrast of the specified drawable to cover all possible ranges.",
"This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue.",
_("Automatically stretch the contrast of the specified drawable to cover all possible ranges."),
_("This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue."),
"Scott Goehring and Federico Mena Quintero",
"Scott Goehring and Federico Mena Quintero",
"1997",
"<Image>/Image/Colors/Auto-Stretch HSV",
_("<Image>/Image/Colors/Auto-Stretch HSV"),
"RGB*, INDEXED*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -100,6 +105,8 @@ run (char *name,
gint32 image_ID;
INIT_I18N();
run_mode = param[0].data.d_int32;
/* Get the specified drawable */
@ -109,7 +116,7 @@ run (char *name,
/* Make sure that the drawable is gray or RGB color */
if (gimp_drawable_color (drawable->id) || gimp_drawable_gray (drawable->id))
{
gimp_progress_init ("Auto-Stretching HSV...");
gimp_progress_init (_("Auto-Stretching HSV..."));
gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1));
autostretch_hsv (drawable);
@ -151,7 +158,7 @@ indexed_autostretch_hsv(gint32 image_ID) /* a.d.m. */
if (cmap==NULL)
{
printf("autostretch_hsv: cmap was NULL! Quitting...\n");
fprintf(stderr, "autostretch_hsv: cmap was NULL! Quitting...\n");
gimp_quit();
}

3
plug-ins/blur/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/plug-ins/gpc/libgpc.a \
$(top_builddir)/libgimp/libgimp.la \

43
plug-ins/blur/blur.c
View File

@ -63,6 +63,8 @@
#include "config.h"
#endif
#include "libgimp/stdplugins-intl.h"
/*********************************
*
* PLUGIN-SPECIFIC CONSTANTS
@ -189,19 +191,21 @@ query()
static GParamDef *return_vals = NULL;
static int nreturn_vals = 0;
const char *blurb = "Apply a 3x3 blurring convolution kernel to the specified drawable.";
const char *help = "This plug-in randomly blurs the specified drawable, using a 3x3 blur. You control the percentage of the pixels that are blurred and the number of times blurring is applied. Indexed images are not supported.";
const char *blurb = _("Apply a 3x3 blurring convolution kernel to the specified drawable.");
const char *help = _("This plug-in randomly blurs the specified drawable, using a 3x3 blur. You control the percentage of the pixels that are blurred and the number of times blurring is applied. Indexed images are not supported.");
const char *author = "Miles O'Neal <meo@rru.com> http://www.rru.com/~meo/";
const char *copyrights = "Miles O'Neal, Spencer Kimball, Peter Mattis, Torsten Martinsen, Brian Degenhardt, Federico Mena Quintero, Stephen Norris, Daniel Cotting";
const char *copyright_date = "1995-1998";
INIT_I18N();
gimp_install_procedure("plug_in_blur_randomize",
(char *) blurb,
(char *) help,
(char *) author,
(char *) copyrights,
(char *) copyright_date,
"<Image>/Filters/Blur/Blur",
_("<Image>/Filters/Blur/Blur"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -240,6 +244,9 @@ run(char *name, int nparams, GParam *param, int *nreturn_vals,
GStatusType status = STATUS_SUCCESS; /* assume the best! */
char prog_label[32];
static GParam values[1];
INIT_I18N();
/*
* Get the specified drawable, do standard initialization.
*/
@ -597,7 +604,7 @@ blur_dialog()
*
* First set up the basic containers, label them, etc.
*/
frame = gtk_frame_new("Parameter Settings");
frame = gtk_frame_new(_("Parameter Settings"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width(GTK_CONTAINER(frame), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 0);
@ -609,14 +616,14 @@ blur_dialog()
/*
* Action area OK & Cancel buttons
*/
gpc_add_action_button("OK", (GtkSignalFunc) blur_ok_callback, dlg,
"Accept settings and apply filter to image");
gpc_add_action_button("Cancel", (GtkSignalFunc) gpc_cancel_callback, dlg,
"Close plug-in without making any changes");
gpc_add_action_button(_("OK"), (GtkSignalFunc) blur_ok_callback, dlg,
_("Accept settings and apply filter to image"));
gpc_add_action_button(_("Cancel"), (GtkSignalFunc) gpc_cancel_callback, dlg,
_("Close plug-in without making any changes"));
/*
* Randomization seed initialization controls
*/
gpc_add_label("Randomization Seed:", table, 0, 1, 1, 2);
gpc_add_label(_("Randomization Seed:"), table, 0, 1, 1, 2);
/*
* Box to hold seed initialization radio buttons
*/
@ -627,8 +634,8 @@ blur_dialog()
/*
* Time button
*/
gpc_add_radio_button(&seed_group, "Current Time", seed_vbox, &do_time,
"Seed random number generator from the current time - this guarantees a reasonable randomization");
gpc_add_radio_button(&seed_group, _("Current Time"), seed_vbox, &do_time,
_("Seed random number generator from the current time - this guarantees a reasonable randomization"));
/*
* Box to hold seed user initialization controls
*/
@ -638,8 +645,8 @@ blur_dialog()
/*
* User button
*/
gpc_add_radio_button(&seed_group, "Other Value", seed_hbox, &do_user,
"Enable user-entered value for random number generator seed - this allows you to repeat a given \"random\" operation");
gpc_add_radio_button(&seed_group, _("Other Value"), seed_hbox, &do_user,
_("Enable user-entered value for random number generator seed - this allows you to repeat a given \"random\" operation"));
/*
* Randomization seed number (text)
*/
@ -651,23 +658,23 @@ blur_dialog()
gtk_signal_connect(GTK_OBJECT(entry), "changed",
(GtkSignalFunc) gpc_text_update, &pivals.blur_seed);
gtk_widget_show(entry);
gpc_set_tooltip(entry, "Value for seeding the random number generator");
gpc_set_tooltip(entry, _("Value for seeding the random number generator"));
gtk_widget_show(seed_hbox);
/*
* Randomization percentage label & scale (1 to 100)
*/
gpc_add_label("Randomization %:", table, 0, 1, 2, 3);
gpc_add_label(_("Randomization %:"), table, 0, 1, 2, 3);
gpc_add_hscale(table, SCALE_WIDTH,
1.0, 100.0, &pivals.blur_pct, 1, 2, 2, 3,
"Percentage of pixels to be filtered");
_("Percentage of pixels to be filtered"));
/*
* Repeat count label & scale (1 to 100)
*/
gpc_add_label("Repeat:", table, 0, 1, 3, 4);
gpc_add_label(_("Repeat:"), table, 0, 1, 3, 4);
gpc_add_hscale(table, SCALE_WIDTH,
1.0, 100.0, &pivals.blur_rcount, 1, 2, 3, 4,
"Number of times to apply filter");
_("Number of times to apply filter"));
/*
* Display everything.

3
plug-ins/bmp/Makefile.am
View File

@ -15,6 +15,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

15
plug-ins/bmp/bmp.c
View File

@ -37,13 +37,14 @@
* ----------------------------------------------------------------------------
*/
#include "config.h"
#include <string.h>
#include <libgimp/gimp.h>
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
#include "bmp.h"
#include "libgimp/stdplugins-intl.h"
FILE *errorfile;
@ -101,8 +102,8 @@ query ()
static int nsave_args = sizeof (save_args) / sizeof (save_args[0]);
gimp_install_procedure ("file_bmp_load",
"Loads files of Windows BMP file format",
"Loads files of Windows BMP file format",
_("Loads files of Windows BMP file format"),
_("Loads files of Windows BMP file format"),
"Alexander Schulz",
"Alexander Schulz",
"1997",
@ -113,8 +114,8 @@ query ()
load_args, load_return_vals);
gimp_install_procedure ("file_bmp_save",
"Saves files in Windows BMP file format",
"Saves files in Windows BMP file format",
_("Saves files in Windows BMP file format"),
_("Saves files in Windows BMP file format"),
"Alexander Schulz",
"Alexander Schulz",
"1997",
@ -149,6 +150,8 @@ run (char *name,
if (strcmp (name, "file_bmp_load") == 0)
{
INIT_I18N();
switch (run_mode)
{
case RUN_INTERACTIVE:
@ -182,6 +185,8 @@ run (char *name,
}
else if (strcmp (name, "file_bmp_save") == 0)
{
INIT_I18N();
switch (run_mode)
{
case RUN_INTERACTIVE:

31
plug-ins/bmp/bmpread.c
View File

@ -2,12 +2,14 @@
/* except OS2 bitmaps (wrong colors) */
/* Alexander.Schulz@stud.uni-karlsruhe.de */
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libgimp/gimp.h>
#include <gtk/gtk.h>
#include "bmp.h"
#include "libgimp/stdplugins-intl.h"
gint32 ReadBMP (name)
char *name;
@ -22,7 +24,7 @@ gint32 ReadBMP (name)
if (interactive_bmp)
{
temp_buf = g_malloc (strlen (name) + 11);
sprintf (temp_buf, "Loading %s:", name);
sprintf (temp_buf, _("Loading %s:"), name);
gimp_progress_init (temp_buf);
g_free (temp_buf);
}
@ -34,7 +36,7 @@ gint32 ReadBMP (name)
if (!fd)
{
printf ("%s: can't open \"%s\"\n", prog_name, filename);
g_message (_("%s: can't open \"%s\"\n"), prog_name, filename);
return -1;
}
@ -42,7 +44,7 @@ gint32 ReadBMP (name)
if (!ReadOK(fd,buf,2) || (strncmp(buf,"BM",2)))
{
printf ("%s: not a valid BMP file %s\n", prog_name,buf);
g_message (_("%s: not a valid BMP file %s\n"), prog_name,buf);
return -1;
}
@ -50,11 +52,11 @@ gint32 ReadBMP (name)
if (!ReadOK (fd, puffer, 0x10))
{
printf ("%s: error reading bitmap file header\n", prog_name);
g_message (_("%s: error reading BMP file header\n"), prog_name);
return -1;
}
/* bring them to the rigth byreorder. Not too nice, but it should work */
/* bring them to the right byteorder. Not too nice, but it should work */
Bitmap_File_Head.bfSize=ToL(&puffer[0]);
Bitmap_File_Head.reserverd=ToL(&puffer[4]);
@ -65,10 +67,10 @@ gint32 ReadBMP (name)
if (Bitmap_File_Head.biSize!=40)
{
printf("\nos2 unsupported!\n");
g_warning(_("OS/2 unsupported!\n"));
if (!ReadOK (fd, puffer, Bitmap_File_Head.biSize))
{
printf ("%s: error reading bitmap header\n", prog_name);
g_message (_("%s: error reading BMP file header\n"), prog_name);
return -1;
}
@ -90,7 +92,7 @@ gint32 ReadBMP (name)
{
if (!ReadOK (fd, puffer, 36))
{
printf ("\n%s: error reading bitmap header\n", prog_name);
g_message (_("%s: error reading BMP file header\n"), prog_name);
return -1;
}
Bitmap_Head.biWidth=ToL(&puffer[0x00]); /* 12 */
@ -112,7 +114,8 @@ gint32 ReadBMP (name)
if (Bitmap_Head.biBitCnt>24)
{
printf("\n%s: to many colors: %u\n",prog_name,(unsigned int) Bitmap_Head.biBitCnt);
g_message(_("%s: too many colors: %u\n"),prog_name,
(unsigned int) Bitmap_Head.biBitCnt);
return -1;
}
@ -159,7 +162,7 @@ gint ReadColorMap (fd, buffer, number, size, grey)
{
if (!ReadOK (fd, rgb, size))
{
printf ("%s: bad colormap\n", prog_name);
g_message (_("%s: bad colormap\n"), prog_name);
return -1;
}
@ -204,7 +207,7 @@ Image ReadImage (fd, len, height, cmap, ncols, bpp, compression, spzeile, grey)
if (grey)
{
image = gimp_image_new (len, height, GRAY);
layer = gimp_layer_new (image, "Background", len, height, GRAY_IMAGE, 100, NORMAL_MODE);
layer = gimp_layer_new (image, _("Background"), len, height, GRAY_IMAGE, 100, NORMAL_MODE);
channels = 1;
}
else
@ -212,19 +215,19 @@ Image ReadImage (fd, len, height, cmap, ncols, bpp, compression, spzeile, grey)
if (bpp<24)
{
image = gimp_image_new (len, height, INDEXED);
layer = gimp_layer_new (image, "Background", len, height, INDEXED_IMAGE, 100, NORMAL_MODE);
layer = gimp_layer_new (image, _("Background"), len, height, INDEXED_IMAGE, 100, NORMAL_MODE);
channels = 1;
}
else
{
image = gimp_image_new (len, height, RGB);
layer = gimp_layer_new (image, "Background", len, height, RGB_IMAGE, 100, NORMAL_MODE);
layer = gimp_layer_new (image, _("Background"), len, height, RGB_IMAGE, 100, NORMAL_MODE);
channels = 3;
}
}
name_buf = g_malloc (strlen (filename) + 10);
sprintf (name_buf, "%s", filename);
strcpy (name_buf, filename);
gimp_image_set_filename(image,name_buf);
g_free (name_buf);

17
plug-ins/bmp/bmpwrite.c
View File

@ -19,6 +19,7 @@
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
#include "bmp.h"
#include "libgimp/stdplugins-intl.h"
guchar *pixels;
int cur_progress;
@ -79,7 +80,7 @@ WriteBMP (filename,image,drawable_ID)
case INDEXED_IMAGE:
break;
default:
printf("bmp: cannot operate on unknown image types or alpha images");
g_message(_("bmp: cannot operate on unknown image types or alpha images"));
gimp_quit ();
break;
}
@ -136,7 +137,7 @@ WriteBMP (filename,image,drawable_ID)
outfile = fopen (filename, "wb");
if (!outfile)
{
fprintf (stderr, "can't open %s\n", filename);
g_message (_("can't open %s\n"), filename);
return -1;
}
@ -150,7 +151,7 @@ WriteBMP (filename,image,drawable_ID)
if (interactive_bmp)
{
temp_buf = g_malloc (strlen (filename) + 11);
sprintf (temp_buf, "Saving %s:", filename);
sprintf (temp_buf, _("Saving %s:"), filename);
gimp_progress_init (temp_buf);
g_free (temp_buf);
}
@ -417,14 +418,14 @@ save_dialog ()
gtk_rc_parse (gimp_gtkrc());
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Save as BMP");
gtk_window_set_title (GTK_WINDOW (dlg), _("Save as BMP"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) save_close_callback,
NULL);
/* Action area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) save_ok_callback,
@ -433,7 +434,7 @@ save_dialog ()
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -442,7 +443,7 @@ save_dialog ()
gtk_widget_show (button);
/* parameter settings */
frame = gtk_frame_new ("Save Options");
frame = gtk_frame_new (_("Save Options"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
@ -450,7 +451,7 @@ save_dialog ()
gtk_container_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_add (GTK_CONTAINER (frame), vbox);
toggle = gtk_check_button_new_with_label ("RLE encoded");
toggle = gtk_check_button_new_with_label (_("RLE encoded"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) save_toggle_update,

3
plug-ins/bumpmap/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimpui.la \
$(top_builddir)/libgimp/libgimp.la \

55
plug-ins/bumpmap/bumpmap.c
View File

@ -98,6 +98,9 @@
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/***** Magic numbers *****/
@ -292,9 +295,9 @@ static bumpmap_interface_t bmint = {
}; /* bmint */
static char *map_types[] = {
"Linear map",
"Spherical map",
"Sinuosidal map"
N_("Linear map"),
N_("Spherical map"),
N_("Sinusoidal map")
}; /* map_types */
GDrawable *drawable = NULL;
@ -337,16 +340,18 @@ query(void)
static int nargs = sizeof(args) / sizeof(args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure(PLUG_IN_NAME,
"Create an embossing effect using an image as a bump map",
"This plug-in uses the algorithm described by John Schlag, "
_("Create an embossing effect using an image as a bump map"),
("This plug-in uses the algorithm described by John Schlag, "
"\"Fast Embossing Effects on Raster Image Data\" in Graphics GEMS IV "
"(ISBN 0-12-336155-9). It takes a grayscale image to be applied as "
"a bump map to another image and produces a nice embossing effect.",
"Federico Mena Quintero and Jens Lautenbacher",
"Federico Mena Quintero and Jens Lautenbacher",
"a bump map to another image and produces a nice embossing effect."),
"Federico Mena Quintero & Jens Lautenbacher",
"Federico Mena Quintero & Jens Lautenbacher",
PLUG_IN_VERSION,
"<Image>/Filters/Map/Bump Map",
_("<Image>/Filters/Map/Bump Map"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs,
@ -370,6 +375,8 @@ run(char *name,
GRunModeType run_mode;
GStatusType status;
INIT_I18N();
status = STATUS_SUCCESS;
run_mode = param[0].data.d_int32;
@ -490,7 +497,7 @@ bumpmap(void)
printf("bumpmap: waiting... (pid %d)\n", getpid());
kill(getpid(), SIGSTOP);
#endif
gimp_progress_init("Bump-mapping...");
gimp_progress_init(_("Bump-mapping..."));
/* Get the bumpmap drawable */
@ -820,7 +827,7 @@ bumpmap_dialog(void)
/* Dialog */
dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), "Bump map");
gtk_window_set_title(GTK_WINDOW(dialog), _("Bump map"));
gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
gtk_container_border_width(GTK_CONTAINER(dialog), 0);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
@ -874,7 +881,7 @@ bumpmap_dialog(void)
/* Compensate darkening */
button = gtk_check_button_new_with_label("Compensate for darkening");
button = gtk_check_button_new_with_label(_("Compensate for darkening"));
gtk_table_attach(GTK_TABLE(table), button, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), bmvals.compensate ? TRUE : FALSE);
@ -885,7 +892,7 @@ bumpmap_dialog(void)
/* Invert bumpmap */
button = gtk_check_button_new_with_label("Invert bumpmap");
button = gtk_check_button_new_with_label(_("Invert bumpmap"));
gtk_table_attach(GTK_TABLE(table), button, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), bmvals.invert ? TRUE : FALSE);
@ -909,7 +916,7 @@ bumpmap_dialog(void)
group = NULL;
for (i = 0; i < (sizeof(map_types) / sizeof(map_types[0])); i++) {
button = gtk_radio_button_new_with_label(group, map_types[i]);
button = gtk_radio_button_new_with_label(group, gettext(map_types[i]));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
if (i == bmvals.type)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@ -929,7 +936,7 @@ bumpmap_dialog(void)
/* Bump map menu */
label = gtk_label_new("Bump map");
label = gtk_label_new(_("Bump map"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 0);
gtk_widget_show(label);
@ -948,19 +955,19 @@ bumpmap_dialog(void)
/* Controls */
dialog_create_dvalue("Azimuth", GTK_TABLE(table), 1, &bmvals.azimuth, 0.0, 360.0);
dialog_create_dvalue("Elevation", GTK_TABLE(table), 2, &bmvals.elevation, 0.5, 90.0);
dialog_create_ivalue("Depth", GTK_TABLE(table), 3, &bmvals.depth, 1, 65, FALSE);
dialog_create_ivalue("X offset", GTK_TABLE(table), 4, &bmvals.xofs, -1000, 1001, FALSE);
dialog_create_ivalue("Y offset", GTK_TABLE(table), 5, &bmvals.yofs, -1000, 1001, FALSE);
dialog_create_ivalue("Waterlevel", GTK_TABLE(table), 6, &bmvals.waterlevel, 0, 256, TRUE);
dialog_create_ivalue("Ambient", GTK_TABLE(table), 7, &bmvals.ambient, 0, 256, FALSE);
dialog_create_dvalue(_("Azimuth"), GTK_TABLE(table), 1, &bmvals.azimuth, 0.0, 360.0);
dialog_create_dvalue(_("Elevation"), GTK_TABLE(table), 2, &bmvals.elevation, 0.5, 90.0);
dialog_create_ivalue(_("Depth"), GTK_TABLE(table), 3, &bmvals.depth, 1, 65, FALSE);
dialog_create_ivalue(_("X offset"), GTK_TABLE(table), 4, &bmvals.xofs, -1000, 1001, FALSE);
dialog_create_ivalue(_("Y offset"), GTK_TABLE(table), 5, &bmvals.yofs, -1000, 1001, FALSE);
dialog_create_ivalue(_("Waterlevel"), GTK_TABLE(table), 6, &bmvals.waterlevel, 0, 256, TRUE);
dialog_create_ivalue(_("Ambient"), GTK_TABLE(table), 7, &bmvals.ambient, 0, 256, FALSE);
/* Buttons */
gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
button = gtk_button_new_with_label("OK");
button = gtk_button_new_with_label(_("OK"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc) dialog_ok_callback,
@ -969,7 +976,7 @@ bumpmap_dialog(void)
gtk_widget_grab_default(button);
gtk_widget_show(button);
button = gtk_button_new_with_label("Cancel");
button = gtk_button_new_with_label(_("Cancel"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc) dialog_cancel_callback,

3
plug-ins/bz2/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GLIB_LIBS)

27
plug-ins/bz2/bz2.c
View File

@ -47,6 +47,9 @@
#endif
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
static void query (void);
static void run (char *name,
@ -144,6 +147,8 @@ run (char *name,
GStatusType status = STATUS_SUCCESS;
gint32 image_ID;
INIT_I18N();
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
@ -285,24 +290,24 @@ save_image (char *filename,
/* fork off a bzip2 process */
if ((pid = fork()) < 0)
{
g_message ("bz2: fork failed: %s\n", g_strerror(errno));
g_message (_("bz2: fork failed: %s\n"), g_strerror(errno));
return -1;
}
else if (pid == 0)
{
if (!(f = fopen(filename,"w"))){
g_message("bz2: fopen failed: %s\n", g_strerror(errno));
g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno));
_exit(127);
}
/* make stdout for this process be the output file */
if (-1 == dup2(fileno(f),fileno(stdout)))
g_message ("bz2: dup2 failed: %s\n", g_strerror(errno));
g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno));
/* and bzip2 into it */
execlp ("bzip2", "bzip2", "-cf", tmpname, NULL);
g_message ("bz2: exec failed: bzip2: %s\n", g_strerror(errno));
g_message (_("bz2: exec failed: bzip2: %s\n"), g_strerror(errno));
_exit(127);
}
else
@ -316,7 +321,7 @@ save_image (char *filename,
if (!WIFEXITED(status) ||
WEXITSTATUS(status) != 0)
{
g_message ("bz2: bzip2 exited abnormally on file %s\n", tmpname);
g_message (_("bz2: bzip2 exited abnormally on file %s\n"), tmpname);
return 0;
}
}
@ -350,24 +355,24 @@ load_image (char *filename, gint32 run_mode)
/* fork off a g(un)zip and wait for it */
if ((pid = fork()) < 0)
{
g_message ("bz2: fork failed: %s\n", g_strerror(errno));
g_message (_("bz2: fork failed: %s\n"), g_strerror(errno));
return -1;
}
else if (pid == 0) /* child process */
{
FILE* f;
if (!(f = fopen(tmpname,"w"))){
g_message("bz2: fopen failed: %s\n", g_strerror(errno));
g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno));
_exit(127);
}
/* make stdout for this child process be the temp file */
if (-1 == dup2(fileno(f),fileno(stdout)))
g_message ("bz2: dup2 failed: %s\n", g_strerror(errno));
g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno));
/* and unzip into it */
execlp ("bzip2", "bzip2", "-cfd", filename, NULL);
g_message ("bz2: exec failed: bunzip2: %s\n", g_strerror(errno));
g_message (_("bz2: exec failed: bunzip2: %s\n"), g_strerror(errno));
_exit(127);
}
else /* parent process */
@ -381,7 +386,7 @@ load_image (char *filename, gint32 run_mode)
if (!WIFEXITED(status) ||
WEXITSTATUS(status) != 0)
{
g_message ("bz2: bzip2 exited abnormally on file %s\n", filename);
g_message (_("bz2: bzip2 exited abnormally on file %s\n"), filename);
return -1;
}
}
@ -435,7 +440,7 @@ static char* find_extension (char* filename)
while (1) {
if (!ext || ext[1] == 0 || strchr(ext, '/'))
{
g_message ("bz2: can't open bzip2ed file without a sensible extension\n");
g_message (_("bz2: can't open bzip2ed file without a sensible extension\n"));
return NULL;
}
if (0 == strcmp(ext, ".xcfbz2")) {

3
plug-ins/checkerboard/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

25
plug-ins/checkerboard/checkerboard.c
View File

@ -24,6 +24,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Variables set in dialog box */
typedef struct data {
gint mode;
@ -88,13 +91,15 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_checkerboard",
"Adds a checkerboard pattern to an image",
_("Adds a checkerboard pattern to an image"),
"More here later",
"Brent Burton & the Edward Blevins",
"Brent Burton & the Edward Blevins",
"1997",
"<Image>/Filters/Render/Checkerboard",
_("<Image>/Filters/Render/Checkerboard"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -113,6 +118,8 @@ run (gchar *name,
GRunModeType run_mode;
GStatusType status = STATUS_SUCCESS;
INIT_I18N();
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
@ -154,7 +161,7 @@ run (gchar *name,
if (gimp_drawable_color (drawable->id) || gimp_drawable_gray (drawable->id))
{
gimp_progress_init ("Adding Checkerboard...");
gimp_progress_init (_("Adding Checkerboard..."));
check (drawable);
@ -364,14 +371,14 @@ check_dialog ()
gtk_rc_parse (gimp_gtkrc ());
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Checkerboard");
gtk_window_set_title (GTK_WINDOW (dlg), _("Checkerboard"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) check_close_callback,
NULL);
/* Action area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) check_ok_callback,
@ -380,7 +387,7 @@ check_dialog ()
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -389,7 +396,7 @@ check_dialog ()
gtk_widget_show (button);
/* parameter settings */
frame = gtk_frame_new ("Parameter Settings");
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
@ -397,7 +404,7 @@ check_dialog ()
gtk_container_border_width (GTK_CONTAINER (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);
toggle = gtk_check_button_new_with_label ("Psychobilly");
toggle = gtk_check_button_new_with_label (_("Psychobilly"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) check_toggle_update,
@ -405,7 +412,7 @@ check_dialog ()
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cvals.mode);
gtk_widget_show (toggle);
label = gtk_label_new ("Check Size");
label = gtk_label_new (_("Check Size"));
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
gtk_widget_show (label);

3
plug-ins/colorify/Makefile.am
View File

@ -12,6 +12,9 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS)

28
plug-ins/colorify/colorify.c
View File

@ -34,6 +34,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_NAME "Colorify"
#define PLUG_IN_VERSION "1.1"
@ -113,11 +116,14 @@ query ()
static int nargs = sizeof(args) / sizeof(args[0]),
nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_colorify",
"Similar to the \"Color\" mode for layers.",
"Makes an average of the RGB channels and uses it to set the color",
_("Similar to the \"Color\" mode for layers."),
_("Makes an average of the RGB channels and uses it to set the color"),
"Francisco Bustamante", "Francisco Bustamante",
"0.0.1", "<Image>/Filters/Colors/Colorify", "RGB",
"0.0.1",
_("<Image>/Filters/Colors/Colorify"), "RGB",
PROC_PLUG_IN,
nargs, nreturn_vals,
args, return_vals);
@ -140,6 +146,8 @@ run (char *name,
static GParam values[1];
GDrawable *drawable;
INIT_I18N();
status = STATUS_SUCCESS;
run_mode = param[0].data.d_int32;
@ -183,7 +191,7 @@ run (char *name,
}
if (status == STATUS_SUCCESS) {
gimp_progress_init("Colorifying...");
gimp_progress_init(_("Colorifying..."));
colorify (drawable);
@ -293,13 +301,13 @@ colorify_dialog (guchar red,
gtk_rc_parse (gimp_gtkrc());
dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dialog), "Colorify");
gtk_window_set_title (GTK_WINDOW (dialog), _("Colorify"));
gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
(GtkSignalFunc) close_callback,
NULL);
button = gtk_button_new_with_label ("Ok");
button = gtk_button_new_with_label (_("Ok"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) colorify_ok_callback,
@ -308,7 +316,7 @@ colorify_dialog (guchar red,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -316,7 +324,7 @@ colorify_dialog (guchar red,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
frame = gtk_frame_new ("Color");
frame = gtk_frame_new (_("Color"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE, 0);
@ -329,7 +337,7 @@ colorify_dialog (guchar red,
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_widget_show (table);
label = gtk_label_new ("Custom Color: ");
label = gtk_label_new (_("Custom Color: "));
gtk_table_attach (GTK_TABLE (table), label, 4, 6, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -419,7 +427,7 @@ custom_color_callback (GtkWidget *widget,
GtkColorSelectionDialog *csd;
gdouble colour[3];
c_dialog = gtk_color_selection_dialog_new ("Colorify Custom Color");
c_dialog = gtk_color_selection_dialog_new (_("Colorify Custom Color"));
csd = GTK_COLOR_SELECTION_DIALOG (c_dialog);
gtk_color_selection_set_update_policy (GTK_COLOR_SELECTION(csd->colorsel),
GTK_UPDATE_DISCONTINUOUS);

265
plug-ins/common/CML_explorer.c
View File

@ -81,6 +81,9 @@
#include <sys/stat.h>
#include <time.h> /* for seed of random number */
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
@ -220,107 +223,107 @@ static GtkTooltips *gtkW_tooltips_new (GtkWidget *frame);
gtkW_menu_item function_menu [] =
{
#define CML_KEEP_VALUES 0
{ "Keep image's values", NULL },
{ N_("Keep image's values"), NULL },
#define CML_KEEP_FIRST 1
{ "Keep the first value", NULL },
{ N_("Keep the first value"), NULL },
#define CML_FILL 2
{ "Fill with parameter k", NULL },
{ N_("Fill with parameter k"), NULL },
#define CML_LOGIST 3
{ "k{x(1-x)}^p", NULL },
{ N_("k{x(1-x)}^p"), NULL },
#define CML_LOGIST_STEP 4
{ "k{x(1-x)}^p stepped", NULL },
{ N_("k{x(1-x)}^p stepped"), NULL },
#define CML_POWER 5
{ "kx^p", NULL },
{ N_("kx^p"), NULL },
#define CML_POWER_STEP 6
{ "kx^p stepped", NULL },
{ N_("kx^p stepped"), NULL },
#define CML_REV_POWER 7
{ "k(1 - x^p)", NULL },
{ N_("k(1 - x^p)"), NULL },
#define CML_REV_POWER_STEP 8
{ "k(1 - x^p) stepped", NULL },
{ N_("k(1 - x^p) stepped"), NULL },
#define CML_DELTA 9
{ "Delta function", NULL },
{ N_("Delta function"), NULL },
#define CML_DELTA_STEP 10
{ "Delta function stepped", NULL },
{ N_("Delta function stepped"), NULL },
#define CML_SIN_CURVE 11
{ "sin^p-based function", NULL },
{ N_("sin^p-based function"), NULL },
#define CML_SIN_CURVE_STEP 12
{ "sin^p, stepped", NULL },
{ N_("sin^p, stepped"), NULL },
};
gtkW_menu_item composition_menu [] =
{
#define COMP_NONE 0
{ "None", NULL },
{ N_("None"), NULL },
#define COMP_MAX_LINEAR 1
{ "Max (x, -)", NULL },
{ N_("Max (x, -)"), NULL },
#define COMP_MAX_LINEAR_P1 2
{ "Max (x+d, -)", NULL },
{ N_("Max (x+d, -)"), NULL },
#define COMP_MAX_LINEAR_M1 3
{ "Max (x-d, -)", NULL },
{ N_("Max (x-d, -)"), NULL },
#define COMP_MIN_LINEAR 4
{ "Mix (x, -)", NULL },
{ N_("Mix (x, -)"), NULL },
#define COMP_MIN_LINEAR_P1 5
{ "Min (x+d, -)", NULL },
{ N_("Min (x+d, -)"), NULL },
#define COMP_MIN_LINEAR_M1 6
{ "Min (x-d, -)", NULL },
{ N_("Min (x-d, -)"), NULL },
#define COMP_MAX_LINEAR_P1L 7
{ "Max (x+d, -), (x < 0.5)", NULL },
{ N_("Max (x+d, -), (x < 0.5)"), NULL },
#define COMP_MAX_LINEAR_P1U 8
{ "Max (x+d, -), (0.5 < x)", NULL },
{ N_("Max (x+d, -), (0.5 < x)"), NULL },
#define COMP_MAX_LINEAR_M1L 9
{ "Max (x-d, -), (x < 0.5)", NULL },
{ N_("Max (x-d, -), (x < 0.5)"), NULL },
#define COMP_MAX_LINEAR_M1U 10
{ "Max (x-d, -), (0.5 < x)", NULL },
{ N_("Max (x-d, -), (0.5 < x)"), NULL },
#define COMP_MIN_LINEAR_P1L 11
{ "Min (x+d, -), (x < 0.5)", NULL },
{ N_("Min (x+d, -), (x < 0.5)"), NULL },
#define COMP_MIN_LINEAR_P1U 12
{ "Min (x+d, -), (0.5 < x)", NULL },
{ N_("Min (x+d, -), (0.5 < x)"), NULL },
#define COMP_MIN_LINEAR_M1L 13
{ "Min (x-d, -), (x < 0.5)", NULL },
{ N_("Min (x-d, -), (x < 0.5)"), NULL },
#define COMP_MIN_LINEAR_M1U 14
{ "Min (x-d, -), (0.5 < x)", NULL }
{ N_("Min (x-d, -), (0.5 < x)"), NULL }
};
gtkW_menu_item arrange_menu [] =
{
#define STANDARD 0
{ "Standard", NULL },
{ N_("Standard"), NULL },
#define AVERAGE 1
{ "Use average value", NULL },
{ N_("Use average value"), NULL },
#define ANTILOG 2
{ "Use reverse value", NULL },
{ N_("Use reverse value"), NULL },
#define RAND_POWER0 3
{ "With random power (0,10)", NULL },
{ N_("With random power (0,10)"), NULL },
#define RAND_POWER1 4
{ "With random power (0,1)", NULL },
{ N_("With random power (0,1)"), NULL },
#define RAND_POWER2 5
{ "With gradient power (0,1)", NULL },
{ N_("With gradient power (0,1)"), NULL },
#define MULTIPLY_RANDOM0 6
{ "Multiply rand. value (0,1)", NULL },
{ N_("Multiply rand. value (0,1)"), NULL },
#define MULTIPLY_RANDOM1 7
{ "Multiply rand. value (0,2)", NULL },
{ N_("Multiply rand. value (0,2)"), NULL },
#define MULTIPLY_GRADIENT 8
{ "Multiply gradient (0,1)", NULL },
{ N_("Multiply gradient (0,1)"), NULL },
#define RAND_AND_P 9
{ "With p and random (0,1)", NULL },
{ N_("With p and random (0,1)"), NULL },
};
gtkW_menu_item initial_value_menu [] =
{
{ "All black", NULL }, /* 0 */
{ "All gray", NULL }, /* 1 */
{ "All white", NULL }, /* 2 */
{ "The first row of the image", NULL }, /* 3 */
{ "Continuous gradient", NULL }, /* 4 */
{ "Continuous grad. w/o gap", NULL }, /* 5 */
{ N_("All black"), NULL }, /* 0 */
{ N_("All gray"), NULL }, /* 1 */
{ N_("All white"), NULL }, /* 2 */
{ N_("The first row of the image"), NULL }, /* 3 */
{ N_("Continuous gradient"), NULL }, /* 4 */
{ N_("Continuous grad. w/o gap"), NULL }, /* 5 */
#define CML_INITIAL_RANDOM_INDEPENDENT 6
{ "Random, ch. independent", NULL },
{ N_("Random, ch. independent"), NULL },
#define CML_INITIAL_RANDOM_SHARED 7
{ "Random shared", NULL },
{ N_("Random shared"), NULL },
#define CML_INITIAL_RANDOM_FROM_SEED 8
{ "Randoms from seed" , NULL },
{ N_("Randoms from seed") , NULL },
#define CML_INITIAL_RANDOM_FROM_SEED_SHARED 9
{ "Randoms from seed (shared)" , NULL }
{ N_("Randoms from seed (shared)") , NULL }
} ;
#define CML_PARAM_NUM 15
@ -374,17 +377,17 @@ static ValueType VALS =
gtkW_menu_item channel_menu [] =
{
{ "Hue", (gpointer) &VALS.hue },
{ "Saturation", (gpointer) &VALS.sat },
{ "Value", (gpointer) &VALS.val },
{ N_("Hue"), (gpointer) &VALS.hue },
{ N_("Saturation"), (gpointer) &VALS.sat },
{ N_("Value"), (gpointer) &VALS.val },
};
gtkW_menu_item sload_menu [] =
{
{ "NULL", NULL },
{ "Hue", NULL },
{ "Saturation", NULL },
{ "Value", NULL },
{ N_("NULL"), NULL },
{ N_("Hue"), NULL },
{ N_("Saturation"), NULL },
{ N_("Value"), NULL },
};
static void query (void);
@ -485,9 +488,11 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure (PLUG_IN_NAME,
"Make an image of Coupled-Map Lattice",
"Make an image of Coupled-Map Lattice (CML). CML is a kind of Cellula Automata on continuous (value) domain. In RUN_NONINTERACTIVE, the name of a prameter file is passed as the 4th arg. You can control CML_explorer via parameter file.",
_("Make an image of Coupled-Map Lattice"),
_("Make an image of Coupled-Map Lattice (CML). CML is a kind of Cellula Automata on continuous (value) domain. In RUN_NONINTERACTIVE, the name of a prameter file is passed as the 4th arg. You can control CML_explorer via parameter file."),
/* Or do you want to call me with over 50 args? */
"Shuji Narazaki (narazaki@InetQ.or.jp); http://www.inetq.or.jp/~narazaki/TheGIMP/",
"Shuji Narazaki",
@ -1319,7 +1324,7 @@ DIALOG ()
gtk_init (&argc, &argv);
gtk_rc_parse (gimp_gtkrc ());
dlg = gtkW_dialog_new ("Coupled-Map-Lattice Explorer",
dlg = gtkW_dialog_new (_("Coupled-Map-Lattice Explorer"),
(GtkSignalFunc) OK_CALLBACK,
(GtkSignalFunc) gtkW_close_callback);
@ -1336,7 +1341,7 @@ DIALOG ()
GtkWidget *hseparator;
table = gtkW_table_new (hbox, 8, 1);
frame = gtkW_frame_new (NULL, "Preview");
frame = gtkW_frame_new (NULL, _("Preview"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1,
0, 0, 0, gtkW_border_width);
preview_box = gtkW_hbox_new (frame);
@ -1377,19 +1382,19 @@ DIALOG ()
GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
}
button = gtkW_table_add_button (table, "New seed", 0, 1, 2,
button = gtkW_table_add_button (table, _("New seed"), 0, 1, 2,
(GtkSignalFunc) CML_preview_update_callback,
&VALS);
random_sensitives[0].widget = button;
random_sensitives[0].logic = TRUE;
button = gtkW_table_add_button (table, "Fix seed", 0, 1, 3,
button = gtkW_table_add_button (table, _("Fix seed"), 0, 1, 3,
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[1].widget = button;
random_sensitives[1].logic = TRUE;
button = gtkW_table_add_button (table, "Random seed", 0, 1, 4,
button = gtkW_table_add_button (table, _("Random seed"), 0, 1, 4,
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[2].widget = button;
@ -1401,10 +1406,10 @@ DIALOG ()
GTK_FILL, GTK_FILL,
gtkW_border_width, 2 * gtkW_border_width);
gtkW_table_add_button (table, "Load", 0, 1, 6,
gtkW_table_add_button (table, _("Load"), 0, 1, 6,
(GtkSignalFunc) CML_load_from_file_callback,
&VALS);
gtkW_table_add_button (table, "Save", 0, 1, 7,
gtkW_table_add_button (table, _("Save"), 0, 1, 7,
(GtkSignalFunc) CML_save_to_file_callback,
&VALS);
}
@ -1421,21 +1426,21 @@ DIALOG ()
gtk_widget_show (notebook);
parent = NULL;
page = CML_dialog_sub_panel_new (parent, "Hue settings", &VALS.hue, 0);
page = CML_dialog_sub_panel_new (parent, _("Hue settings"), &VALS.hue, 0);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Hue"));
gtk_label_new (_("Hue")));
page = CML_dialog_sub_panel_new (parent, "Saturation settings", &VALS.sat, 1);
page = CML_dialog_sub_panel_new (parent, _("Saturation settings"), &VALS.sat, 1);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Saturation"));
gtk_label_new (_("Saturation")));
page = CML_dialog_sub_panel_new (parent, "Value (grayimage) settings", &VALS.val, 2);
page = CML_dialog_sub_panel_new (parent, _("Value (grayimage) settings"), &VALS.val, 2);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Value"));
gtk_label_new (_("Value")));
page = CML_dialog_advanced_panel_new (parent, "Advanced settings");
page = CML_dialog_advanced_panel_new (parent, _("Advanced settings"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page,
gtk_label_new ("Advanced"));
gtk_label_new (_("Advanced")));
{
GtkWidget *table;
@ -1447,26 +1452,26 @@ DIALOG ()
gint index;
gint sindex;
frame = gtkW_frame_new (NULL, "Other parameter settings");
frame = gtkW_frame_new (NULL, _("Other parameter settings"));
vbox = gtkW_vbox_new (frame);
table = gtkW_table_new (vbox, 6, 1);
index = 0;
subframe = gtkW_frame_new (NULL, "Channel independed parameters");
subframe = gtkW_frame_new (NULL, _("Channel independed parameters"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 3, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Initial value", 0, sindex++,
gtkW_table_add_menu (subtable, _("Initial value"), 0, sindex++,
(GtkSignalFunc) CML_initial_value_menu_update,
&VALS.initial_value,
initial_value_menu,
sizeof (initial_value_menu) / sizeof (initial_value_menu[0]),
&widget_pointers[3][0]);
gtkW_table_add_iscale_entry (subtable, "Zoom scale", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Zoom scale"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.scale,
1, 10, 1, &widget_pointers[3][1]);
gtkW_table_add_iscale_entry (subtable, "Start offset", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Start offset"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.start_offset,
@ -1486,11 +1491,11 @@ DIALOG ()
index++;
}
subframe = gtkW_frame_new (NULL, "Seed of random (only for \"from seed\" modes)");
subframe = gtkW_frame_new (NULL, _("Seed of random (only for \"from seed\" modes)"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 1, 2);
sindex = 0;
gtkW_table_add_iscale_entry (subtable, "Seed", 0, sindex++,
gtkW_table_add_iscale_entry (subtable, _("Seed"), 0, sindex++,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&VALS.seed, 0, 1 << 15, 1,
@ -1500,14 +1505,14 @@ DIALOG ()
{
GtkWidget *button;
button = gtkW_vbox_add_button (box, "Switch to \"from seed\" with the last seed",
button = gtkW_vbox_add_button (box, _("Switch to \"from seed\" with the last seed"),
(GtkSignalFunc) CML_set_or_randomize_seed_callback,
&VALS);
random_sensitives[4].widget = button;
random_sensitives[4].logic = TRUE;
tooltips = gtkW_tooltips_new (frame);
gtk_tooltips_set_tip (tooltips, button, "\"Fix seed\" button is an alias of me.\nThe same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero.",NULL);
gtk_tooltips_set_tip (tooltips, button, _("\"Fix seed\" button is an alias of me.\nThe same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero."), NULL);
gtk_tooltips_enable (tooltips);
}
gtk_table_attach (GTK_TABLE (table), subframe, 0, 1, index, index + 1,
@ -1524,35 +1529,35 @@ DIALOG ()
index++;
}
label = gtk_label_new ("Others");
label = gtk_label_new (_("Others"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
}
{
GtkWidget *table, *subtable, *frame, *subframe, *box, *vbox;
int index, sindex;
frame = gtkW_frame_new (NULL, "Misc operations");
frame = gtkW_frame_new (NULL, _("Misc operations"));
vbox = gtkW_vbox_new (frame);
table = gtkW_table_new (vbox, 4, 1);
index = 0;
subframe = gtkW_frame_new (NULL, "Copy settings");
subframe = gtkW_frame_new (NULL, _("Copy settings"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 3, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Source ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Source ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&copy_source,
channel_menu,
sizeof (channel_menu) / sizeof (channel_menu[0]),
NULL);
gtkW_table_add_menu (subtable, "Destination ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Destination ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&copy_destination,
channel_menu,
sizeof (channel_menu) / sizeof (channel_menu[0]),
NULL);
gtkW_table_add_button (subtable, "Do copy parameters",
gtkW_table_add_button (subtable, _("Do copy parameters"),
0, 2, sindex++,
(GtkSignalFunc) CML_copy_parameters_callback,
&VALS);
@ -1570,17 +1575,17 @@ DIALOG ()
index++;
}
subframe = gtkW_frame_new (NULL, "Selective load settings");
subframe = gtkW_frame_new (NULL, _("Selective load settings"));
box = gtkW_vbox_new (subframe);
subtable = gtkW_table_new (box, 2, 2);
sindex = 0;
gtkW_table_add_menu (subtable, "Source ch. in file", 0, sindex++,
gtkW_table_add_menu (subtable, _("Source ch. in file"), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&selective_load_source,
sload_menu,
sizeof (sload_menu) / sizeof (sload_menu[0]),
NULL);
gtkW_table_add_menu (subtable, "Destination ch.", 0, sindex++,
gtkW_table_add_menu (subtable, _("Destination ch."), 0, sindex++,
(GtkSignalFunc) gtkW_menu_update,
&selective_load_destination,
sload_menu,
@ -1600,7 +1605,7 @@ DIALOG ()
index++;
}
label = gtk_label_new ("Misc ops.");
label = gtk_label_new (_("Misc ops."));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
}
}
@ -1636,82 +1641,82 @@ CML_dialog_sub_panel_new (GtkWidget *parent,
subframe = gtkW_frame_new (parent, name);
table = gtkW_table_new (subframe, 14, 2);
gtkW_table_add_menu (table, "Function type", 0, index,
gtkW_table_add_menu (table, _("Function type"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->function,
function_menu,
sizeof (function_menu) / sizeof (function_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_menu (table, "Composition", 0, index,
gtkW_table_add_menu (table, _("Composition"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->composition,
composition_menu,
sizeof (composition_menu) / sizeof (composition_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_menu (table, "Misc arrange", 0, index,
gtkW_table_add_menu (table, _("Misc arrange"), 0, index,
(GtkSignalFunc) CML_menu_update,
&param->arrange,
arrange_menu,
sizeof (arrange_menu) / sizeof (arrange_menu[0]),
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_toggle (table, "Use cyclic range", 0, index,
gtkW_table_add_toggle (table, _("Use cyclic range"), 0, index,
(GtkSignalFunc) gtkW_toggle_update,
&param->cyclic_range,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Mod. rate", 0, index,
gtkW_table_add_dscale_entry (table, _("Mod. rate"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mod_rate,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Env. sensitivity", 0, index,
gtkW_table_add_dscale_entry (table, _("Env. sensitivity"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->env_sensitivity,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_iscale_entry (table, "Diffusion dist.", 0, index,
gtkW_table_add_iscale_entry (table, _("Diffusion dist."), 0, index,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&param->diffusion_dist,
2, 10, 1,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_iscale_entry (table, "# of subranges", 0, index,
gtkW_table_add_iscale_entry (table, _("# of subranges"), 0, index,
(GtkSignalFunc) gtkW_iscale_update,
(GtkSignalFunc) gtkW_ientry_update,
&param->range_num,
1, 10, 1,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "P(ower factor)", 0, index,
gtkW_table_add_dscale_entry (table, _("P(ower factor)"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->power,
0.0, 10.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Parameter k", 0, index,
gtkW_table_add_dscale_entry (table, _("Parameter k"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->parameter_k,
0.0, 10.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Range low", 0, index,
gtkW_table_add_dscale_entry (table, _("Range low"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->range_l,
0, 1.0, 0.01,
&widget_pointers[channel_id][index]);
index++;
gtkW_table_add_dscale_entry (table, "Range high", 0, index,
gtkW_table_add_dscale_entry (table, _("Range high"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->range_h,
@ -1730,7 +1735,7 @@ CML_dialog_sub_panel_new (GtkWidget *parent,
chank = (gpointer *) g_malloc (2 *sizeof (gpointer));
chank[0] = (gpointer) channel_id;
chank[1] = (gpointer) param;
gtkW_table_add_button (table, "Plot the graph of the settings",
gtkW_table_add_button (table, _("Plot the graph of the settings"),
0, 2, index++,
(GtkSignalFunc) function_graph_new, chank);
@ -1747,7 +1752,7 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name)
gint index = 0;
gint widget_offset = 12;
gint channel_id;
gchar *ch_name[] = { "Hue", "Saturation", "Value" };
gchar *ch_name[] = { N_("Hue"), N_("Saturation"), N_("Value") };
CML_PARAM *param;
frame = gtkW_frame_new (parent, name);
@ -1757,28 +1762,28 @@ CML_dialog_advanced_panel_new (GtkWidget *parent, gchar *name)
{
param = (CML_PARAM *)&VALS + channel_id;
subframe = gtkW_frame_new (NULL, ch_name[channel_id]);
subframe = gtkW_frame_new (NULL, gettext(ch_name[channel_id]));
gtk_table_attach (GTK_TABLE (table), subframe,
0, 1, channel_id, channel_id + 1,
GTK_FILL, GTK_FILL, 0, 0);
subtable = gtkW_table_new (subframe, 3, 2);
index = 0;
gtkW_table_add_dscale_entry (subtable, "Ch. sensitivity", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Ch. sensitivity"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->ch_sensitivity,
0.0, 1.0, 0.01,
&widget_pointers[channel_id][index + widget_offset]);
index++;
gtkW_table_add_dscale_entry (subtable, "Mutation rate", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Mutation rate"), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mutation_rate,
0, 1.0, 0.01,
&widget_pointers[channel_id][index + widget_offset]);
index++;
gtkW_table_add_dscale_entry (subtable, "Mutation dist.", 0, index,
gtkW_table_add_dscale_entry (subtable, _("Mutation dist."), 0, index,
(GtkSignalFunc) gtkW_dscale_update,
(GtkSignalFunc) gtkW_dentry_update,
&param->mutation_dist,
@ -1807,12 +1812,12 @@ function_graph_new (GtkWidget *widget, gpointer data)
CML_PARAM *param = (CML_PARAM *) *((gpointer *)data + 1);
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Graph of the current settings");
gtk_window_set_title (GTK_WINDOW (dlg), _("Graph of the current settings"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) gtkW_close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -1822,7 +1827,7 @@ function_graph_new (GtkWidget *widget, gpointer data)
gtk_widget_grab_default (button);
gtk_widget_show (button);
frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, "The Graph");
frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, _("The Graph"));
vbox = gtkW_vbox_new (frame);
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
@ -1914,7 +1919,7 @@ CML_copy_parameters_callback (GtkWidget *widget, gpointer data)
if (copy_source == copy_destination)
{
gtkW_message_dialog (TRUE, "Warning: the source and the destination are the same channel.");
gtkW_message_dialog (TRUE, _("Warning: the source and the destination are the same channel."));
gdk_flush ();
return;
}
@ -2002,7 +2007,7 @@ CML_dialog_new (char * name,
(GtkSignalFunc) close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("Execute");
button = gtk_button_new_with_label (_("Execute"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) execute_callback, dlg);
@ -2011,7 +2016,7 @@ CML_dialog_new (char * name,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Execute and Exit");
button = gtk_button_new_with_label (_("Execute and Exit"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) ok_callback, dlg);
@ -2019,7 +2024,7 @@ CML_dialog_new (char * name,
TRUE, TRUE, 0);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Exit");
button = gtk_button_new_with_label (_("Exit"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2037,7 +2042,7 @@ CML_save_to_file_callback (GtkWidget *widget, gpointer client_data)
{
GtkWidget *filesel;
filesel = gtk_file_selection_new ("Save parameters to");
filesel = gtk_file_selection_new (_("Save parameters to"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
@ -2100,7 +2105,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
{
gchar buffer[CML_LINE_SIZE];
sprintf (buffer, "Error: could not open \"%s\"", filename);
sprintf (buffer, _("Error: could not open \"%s\""), filename);
gtkW_message_dialog (TRUE, buffer);
return;
}
@ -2165,14 +2170,14 @@ force_overwrite (char *filename)
gchar buffer[CML_LINE_SIZE];
gint tmp;
dlg = gtkW_dialog_new ("CML file operation warning",
dlg = gtkW_dialog_new (_("CML file operation warning"),
(GtkSignalFunc) CML_overwrite_ok_callback,
(GtkSignalFunc) gtkW_close_callback);
table = gtkW_table_new (NULL, 1, 1);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
sprintf (buffer, "%s exists, overwrite?", filename);
sprintf (buffer, _("%s exists, overwrite?"), filename);
label = gtk_label_new (buffer);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND,
0, 0, 0);
@ -2215,9 +2220,9 @@ CML_load_from_file_callback (GtkWidget *widget, gpointer client_data)
GtkWidget *filesel;
if ((selective_load_source == 0) || (selective_load_destination == 0))
filesel = gtk_file_selection_new ("Load parameters from");
filesel = gtk_file_selection_new (_("Load parameters from"));
else
filesel = gtk_file_selection_new ("Selective load from");
filesel = gtk_file_selection_new (_("Selective load from"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
@ -2293,7 +2298,7 @@ CML_load_parameter_file (gchar *filename, gint interactive_mode)
if (interactive_mode)
{
sprintf (buffer, "Error: could not open \"%s\"", filename);
sprintf (buffer, _("Error: could not open \"%s\""), filename);
gtkW_message_dialog (TRUE, buffer);
}
return FALSE;
@ -2316,16 +2321,16 @@ CML_load_parameter_file (gchar *filename, gint interactive_mode)
if (version == 0)
{
if (interactive_mode)
gtkW_message_dialog (TRUE, "Error: it's not CML parameter file.");
gtkW_message_dialog (TRUE, _("Error: it's not CML parameter file."));
fclose(file);
return FALSE;
}
if (interactive_mode)
{
if (version < PARAM_FILE_FORMAT_VERSION)
gtkW_message_dialog (TRUE, "Warning: it's an old format file.");
gtkW_message_dialog (TRUE, _("Warning: it's an old format file."));
if (PARAM_FILE_FORMAT_VERSION < version)
gtkW_message_dialog (TRUE, "Warning: Hmmm, it's a parameter file for newer CML_explorer than me.");
gtkW_message_dialog (TRUE, _("Warning: Hmmm, it's a parameter file for newer CML_explorer than me."));
}
for (channel_id = 0; flag && (channel_id < 3); channel_id++)
{
@ -2673,7 +2678,7 @@ gtkW_dialog_new (gchar *name,
(GtkSignalFunc) close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) ok_callback, dlg);
@ -2682,7 +2687,7 @@ gtkW_dialog_new (gchar *name,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2769,7 +2774,7 @@ gtkW_message_dialog_new (gchar * name)
(GtkSignalFunc) gtkW_close_callback, NULL);
/* Action Area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -2972,7 +2977,7 @@ gtkW_table_add_menu (GtkWidget *table,
buffer[0] = (gint *) ((*val == i) ? TRUE : FALSE); /* for trick */
buffer[1] = val; /* for pointer */
buffer[2] = (gint *) i; /* for value */
menuitem = gtk_menu_item_new_with_label (item[i].name);
menuitem = gtk_menu_item_new_with_label (gettext(item[i].name));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) menu_update,

33
plug-ins/common/apply_lens.c
View File

@ -58,6 +58,9 @@
#include "libgimp/gimp.h"
#include "gtk/gtk.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
@ -127,13 +130,15 @@ query(void)
static int nargs = sizeof(args)/ sizeof(args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure("plug_in_applylens",
"Apply a lens effect",
"This plug-in uses Snell's law to draw an ellipsoid lens over the image",
_("Apply a lens effect"),
_("This plug-in uses Snell's law to draw an ellipsoid lens over the image"),
"Morten Eriksen",
"Morten Eriksen",
"1997",
"<Image>/Filters/Glass Effects/Apply Lens",
_("<Image>/Filters/Glass Effects/Apply Lens"),
"RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -152,6 +157,8 @@ run(char *name,
GRunModeType run_mode;
GStatusType status = STATUS_SUCCESS;
INIT_I18N();
run_mode = param[0].data.d_int32;
values[0].type = PARAM_STATUS;
@ -190,7 +197,7 @@ run(char *name,
}
gimp_tile_cache_ntiles(2 *(drawable->width / gimp_tile_width() + 1));
gimp_progress_init("Applying lens...");
gimp_progress_init(_("Applying lens..."));
drawlens(drawable);
if(run_mode != RUN_NONINTERACTIVE)
@ -404,13 +411,13 @@ lens_dialog(GDrawable *drawable)
gtk_rc_parse(gimp_gtkrc());
dlg = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dlg), "Lens effect");
gtk_window_set_title(GTK_WINDOW(dlg), _("Lens effect"));
gtk_window_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
(GtkSignalFunc)lens_close_callback,
NULL);
button = gtk_button_new_with_label("OK");
button = gtk_button_new_with_label(_("OK"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc)lens_ok_callback,
@ -420,7 +427,7 @@ lens_dialog(GDrawable *drawable)
gtk_widget_grab_default(button);
gtk_widget_show(button);
button = gtk_button_new_with_label("Cancel");
button = gtk_button_new_with_label(_("Cancel"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
(GtkSignalFunc)gtk_widget_destroy,
@ -429,7 +436,7 @@ lens_dialog(GDrawable *drawable)
button, TRUE, TRUE, 0);
gtk_widget_show(button);
frame = gtk_frame_new("Parameter Settings");
frame = gtk_frame_new(_("Parameter Settings"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width(GTK_CONTAINER(frame), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 0);
@ -438,7 +445,7 @@ lens_dialog(GDrawable *drawable)
gtk_container_add(GTK_CONTAINER(frame), vbox);
toggle = gtk_radio_button_new_with_label(group,
"Keep original surroundings");
_("Keep original surroundings"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -451,8 +458,8 @@ lens_dialog(GDrawable *drawable)
gtk_radio_button_new_with_label(group,
drawtype == INDEXEDA_IMAGE ||
drawtype == INDEXED_IMAGE ?
"Set surroundings to index 0" :
"Set surroundings to background color");
_("Set surroundings to index 0") :
_("Set surroundings to background color"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -465,7 +472,7 @@ lens_dialog(GDrawable *drawable)
(drawtype == GRAYA_IMAGE) ||
(drawtype == RGBA_IMAGE)) {
toggle = gtk_radio_button_new_with_label(group,
"Make surroundings transparent");
_("Make surroundings transparent"));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(toggle));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@ -480,7 +487,7 @@ lens_dialog(GDrawable *drawable)
hbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
label = gtk_label_new("Lens refraction index: ");
label = gtk_label_new(_("Lens refraction index: "));
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0);
gtk_widget_show(label);

17
plug-ins/common/autostretch_hsv.c
View File

@ -34,6 +34,9 @@
#include <stdio.h>
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Declare local functions.
*/
static void query (void);
@ -73,13 +76,15 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_autostretch_hsv",
"Automatically stretch the contrast of the specified drawable to cover all possible ranges.",
"This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue.",
_("Automatically stretch the contrast of the specified drawable to cover all possible ranges."),
_("This simple plug-in does an automatic contrast stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full contrast range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue."),
"Scott Goehring and Federico Mena Quintero",
"Scott Goehring and Federico Mena Quintero",
"1997",
"<Image>/Image/Colors/Auto-Stretch HSV",
_("<Image>/Image/Colors/Auto-Stretch HSV"),
"RGB*, INDEXED*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -100,6 +105,8 @@ run (char *name,
gint32 image_ID;
INIT_I18N();
run_mode = param[0].data.d_int32;
/* Get the specified drawable */
@ -109,7 +116,7 @@ run (char *name,
/* Make sure that the drawable is gray or RGB color */
if (gimp_drawable_color (drawable->id) || gimp_drawable_gray (drawable->id))
{
gimp_progress_init ("Auto-Stretching HSV...");
gimp_progress_init (_("Auto-Stretching HSV..."));
gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1));
autostretch_hsv (drawable);
@ -151,7 +158,7 @@ indexed_autostretch_hsv(gint32 image_ID) /* a.d.m. */
if (cmap==NULL)
{
printf("autostretch_hsv: cmap was NULL! Quitting...\n");
fprintf(stderr, "autostretch_hsv: cmap was NULL! Quitting...\n");
gimp_quit();
}

43
plug-ins/common/blur.c
View File

@ -63,6 +63,8 @@
#include "config.h"
#endif
#include "libgimp/stdplugins-intl.h"
/*********************************
*
* PLUGIN-SPECIFIC CONSTANTS
@ -189,19 +191,21 @@ query()
static GParamDef *return_vals = NULL;
static int nreturn_vals = 0;
const char *blurb = "Apply a 3x3 blurring convolution kernel to the specified drawable.";
const char *help = "This plug-in randomly blurs the specified drawable, using a 3x3 blur. You control the percentage of the pixels that are blurred and the number of times blurring is applied. Indexed images are not supported.";
const char *blurb = _("Apply a 3x3 blurring convolution kernel to the specified drawable.");
const char *help = _("This plug-in randomly blurs the specified drawable, using a 3x3 blur. You control the percentage of the pixels that are blurred and the number of times blurring is applied. Indexed images are not supported.");
const char *author = "Miles O'Neal <meo@rru.com> http://www.rru.com/~meo/";
const char *copyrights = "Miles O'Neal, Spencer Kimball, Peter Mattis, Torsten Martinsen, Brian Degenhardt, Federico Mena Quintero, Stephen Norris, Daniel Cotting";
const char *copyright_date = "1995-1998";
INIT_I18N();
gimp_install_procedure("plug_in_blur_randomize",
(char *) blurb,
(char *) help,
(char *) author,
(char *) copyrights,
(char *) copyright_date,
"<Image>/Filters/Blur/Blur",
_("<Image>/Filters/Blur/Blur"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -240,6 +244,9 @@ run(char *name, int nparams, GParam *param, int *nreturn_vals,
GStatusType status = STATUS_SUCCESS; /* assume the best! */
char prog_label[32];
static GParam values[1];
INIT_I18N();
/*
* Get the specified drawable, do standard initialization.
*/
@ -597,7 +604,7 @@ blur_dialog()
*
* First set up the basic containers, label them, etc.
*/
frame = gtk_frame_new("Parameter Settings");
frame = gtk_frame_new(_("Parameter Settings"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width(GTK_CONTAINER(frame), 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 0);
@ -609,14 +616,14 @@ blur_dialog()
/*
* Action area OK & Cancel buttons
*/
gpc_add_action_button("OK", (GtkSignalFunc) blur_ok_callback, dlg,
"Accept settings and apply filter to image");
gpc_add_action_button("Cancel", (GtkSignalFunc) gpc_cancel_callback, dlg,
"Close plug-in without making any changes");
gpc_add_action_button(_("OK"), (GtkSignalFunc) blur_ok_callback, dlg,
_("Accept settings and apply filter to image"));
gpc_add_action_button(_("Cancel"), (GtkSignalFunc) gpc_cancel_callback, dlg,
_("Close plug-in without making any changes"));
/*
* Randomization seed initialization controls
*/
gpc_add_label("Randomization Seed:", table, 0, 1, 1, 2);
gpc_add_label(_("Randomization Seed:"), table, 0, 1, 1, 2);
/*
* Box to hold seed initialization radio buttons
*/
@ -627,8 +634,8 @@ blur_dialog()
/*
* Time button
*/
gpc_add_radio_button(&seed_group, "Current Time", seed_vbox, &do_time,
"Seed random number generator from the current time - this guarantees a reasonable randomization");
gpc_add_radio_button(&seed_group, _("Current Time"), seed_vbox, &do_time,
_("Seed random number generator from the current time - this guarantees a reasonable randomization"));
/*
* Box to hold seed user initialization controls
*/
@ -638,8 +645,8 @@ blur_dialog()
/*
* User button
*/
gpc_add_radio_button(&seed_group, "Other Value", seed_hbox, &do_user,
"Enable user-entered value for random number generator seed - this allows you to repeat a given \"random\" operation");
gpc_add_radio_button(&seed_group, _("Other Value"), seed_hbox, &do_user,
_("Enable user-entered value for random number generator seed - this allows you to repeat a given \"random\" operation"));
/*
* Randomization seed number (text)
*/
@ -651,23 +658,23 @@ blur_dialog()
gtk_signal_connect(GTK_OBJECT(entry), "changed",
(GtkSignalFunc) gpc_text_update, &pivals.blur_seed);
gtk_widget_show(entry);
gpc_set_tooltip(entry, "Value for seeding the random number generator");
gpc_set_tooltip(entry, _("Value for seeding the random number generator"));
gtk_widget_show(seed_hbox);
/*
* Randomization percentage label & scale (1 to 100)
*/
gpc_add_label("Randomization %:", table, 0, 1, 2, 3);
gpc_add_label(_("Randomization %:"), table, 0, 1, 2, 3);
gpc_add_hscale(table, SCALE_WIDTH,
1.0, 100.0, &pivals.blur_pct, 1, 2, 2, 3,
"Percentage of pixels to be filtered");
_("Percentage of pixels to be filtered"));
/*
* Repeat count label & scale (1 to 100)
*/
gpc_add_label("Repeat:", table, 0, 1, 3, 4);
gpc_add_label(_("Repeat:"), table, 0, 1, 3, 4);
gpc_add_hscale(table, SCALE_WIDTH,
1.0, 100.0, &pivals.blur_rcount, 1, 2, 3, 4,
"Number of times to apply filter");
_("Number of times to apply filter"));
/*
* Display everything.

14
plug-ins/common/borderaverage.c-28877
View File

@ -24,6 +24,8 @@
#include <gck/gck.h>
#include <plug-ins/megawidget/megawidget.h>
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Declare local functions.
@ -85,13 +87,15 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = sizeof (return_vals) / sizeof (return_vals[0]);
INIT_I18N();
gimp_install_procedure ("plug_in_borderaverage",
"Borderaverage",
"",
"Philipp Klaus",
"Internet Access AG",
"1998",
"<Image>/Filters/Colors/Border Average",
_("<Image>/Filters/Colors/Border Average"),
"RGB*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -111,6 +115,8 @@ run (char *name,
GStatusType status = STATUS_SUCCESS;
gint8 *result_color;
INIT_I18N();
run_mode = param[0].data.d_int32;
/* get the return memory */
@ -330,13 +336,13 @@ static gint borderaverage_dialog() {
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show(vbox);
mw_ientry_new(vbox, "Border Size", "Thickness", &borderaverage_thickness);
mw_ientry_new(vbox, _("Border Size"), _("Thickness"), &borderaverage_thickness);
frame=gck_frame_new("Number of colors",vbox,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,2);
frame=gck_frame_new(_("Number of colors"),vbox,GTK_SHADOW_ETCHED_IN,FALSE,FALSE,0,2);
vbox2=gck_vbox_new(frame,FALSE,TRUE,TRUE,5,0,5);
menu=gck_option_menu_new("Bucket Size:",vbox2,TRUE,TRUE,0,
menu=gck_option_menu_new(_("Bucket Size:"),vbox2,TRUE,TRUE,0,
menu_labels,(GtkSignalFunc)menu_callback, NULL);
gtk_option_menu_set_history(GTK_OPTION_MENU(menu),borderaverage_bucket_exponent);
gtk_widget_show(menu);

55
plug-ins/common/bumpmap.c
View File

@ -98,6 +98,9 @@
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/***** Magic numbers *****/
@ -292,9 +295,9 @@ static bumpmap_interface_t bmint = {
}; /* bmint */
static char *map_types[] = {
"Linear map",
"Spherical map",
"Sinuosidal map"
N_("Linear map"),
N_("Spherical map"),
N_("Sinusoidal map")
}; /* map_types */
GDrawable *drawable = NULL;
@ -337,16 +340,18 @@ query(void)
static int nargs = sizeof(args) / sizeof(args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure(PLUG_IN_NAME,
"Create an embossing effect using an image as a bump map",
"This plug-in uses the algorithm described by John Schlag, "
_("Create an embossing effect using an image as a bump map"),
("This plug-in uses the algorithm described by John Schlag, "
"\"Fast Embossing Effects on Raster Image Data\" in Graphics GEMS IV "
"(ISBN 0-12-336155-9). It takes a grayscale image to be applied as "
"a bump map to another image and produces a nice embossing effect.",
"Federico Mena Quintero and Jens Lautenbacher",
"Federico Mena Quintero and Jens Lautenbacher",
"a bump map to another image and produces a nice embossing effect."),
"Federico Mena Quintero & Jens Lautenbacher",
"Federico Mena Quintero & Jens Lautenbacher",
PLUG_IN_VERSION,
"<Image>/Filters/Map/Bump Map",
_("<Image>/Filters/Map/Bump Map"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs,
@ -370,6 +375,8 @@ run(char *name,
GRunModeType run_mode;
GStatusType status;
INIT_I18N();
status = STATUS_SUCCESS;
run_mode = param[0].data.d_int32;
@ -490,7 +497,7 @@ bumpmap(void)
printf("bumpmap: waiting... (pid %d)\n", getpid());
kill(getpid(), SIGSTOP);
#endif
gimp_progress_init("Bump-mapping...");
gimp_progress_init(_("Bump-mapping..."));
/* Get the bumpmap drawable */
@ -820,7 +827,7 @@ bumpmap_dialog(void)
/* Dialog */
dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), "Bump map");
gtk_window_set_title(GTK_WINDOW(dialog), _("Bump map"));
gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
gtk_container_border_width(GTK_CONTAINER(dialog), 0);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
@ -874,7 +881,7 @@ bumpmap_dialog(void)
/* Compensate darkening */
button = gtk_check_button_new_with_label("Compensate for darkening");
button = gtk_check_button_new_with_label(_("Compensate for darkening"));
gtk_table_attach(GTK_TABLE(table), button, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), bmvals.compensate ? TRUE : FALSE);
@ -885,7 +892,7 @@ bumpmap_dialog(void)
/* Invert bumpmap */
button = gtk_check_button_new_with_label("Invert bumpmap");
button = gtk_check_button_new_with_label(_("Invert bumpmap"));
gtk_table_attach(GTK_TABLE(table), button, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), bmvals.invert ? TRUE : FALSE);
@ -909,7 +916,7 @@ bumpmap_dialog(void)
group = NULL;
for (i = 0; i < (sizeof(map_types) / sizeof(map_types[0])); i++) {
button = gtk_radio_button_new_with_label(group, map_types[i]);
button = gtk_radio_button_new_with_label(group, gettext(map_types[i]));
group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
if (i == bmvals.type)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@ -929,7 +936,7 @@ bumpmap_dialog(void)
/* Bump map menu */
label = gtk_label_new("Bump map");
label = gtk_label_new(_("Bump map"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 0);
gtk_widget_show(label);
@ -948,19 +955,19 @@ bumpmap_dialog(void)
/* Controls */
dialog_create_dvalue("Azimuth", GTK_TABLE(table), 1, &bmvals.azimuth, 0.0, 360.0);
dialog_create_dvalue("Elevation", GTK_TABLE(table), 2, &bmvals.elevation, 0.5, 90.0);
dialog_create_ivalue("Depth", GTK_TABLE(table), 3, &bmvals.depth, 1, 65, FALSE);
dialog_create_ivalue("X offset", GTK_TABLE(table), 4, &bmvals.xofs, -1000, 1001, FALSE);
dialog_create_ivalue("Y offset", GTK_TABLE(table), 5, &bmvals.yofs, -1000, 1001, FALSE);
dialog_create_ivalue("Waterlevel", GTK_TABLE(table), 6, &bmvals.waterlevel, 0, 256, TRUE);
dialog_create_ivalue("Ambient", GTK_TABLE(table), 7, &bmvals.ambient, 0, 256, FALSE);
dialog_create_dvalue(_("Azimuth"), GTK_TABLE(table), 1, &bmvals.azimuth, 0.0, 360.0);
dialog_create_dvalue(_("Elevation"), GTK_TABLE(table), 2, &bmvals.elevation, 0.5, 90.0);
dialog_create_ivalue(_("Depth"), GTK_TABLE(table), 3, &bmvals.depth, 1, 65, FALSE);
dialog_create_ivalue(_("X offset"), GTK_TABLE(table), 4, &bmvals.xofs, -1000, 1001, FALSE);
dialog_create_ivalue(_("Y offset"), GTK_TABLE(table), 5, &bmvals.yofs, -1000, 1001, FALSE);
dialog_create_ivalue(_("Waterlevel"), GTK_TABLE(table), 6, &bmvals.waterlevel, 0, 256, TRUE);
dialog_create_ivalue(_("Ambient"), GTK_TABLE(table), 7, &bmvals.ambient, 0, 256, FALSE);
/* Buttons */
gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
button = gtk_button_new_with_label("OK");
button = gtk_button_new_with_label(_("OK"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc) dialog_ok_callback,
@ -969,7 +976,7 @@ bumpmap_dialog(void)
gtk_widget_grab_default(button);
gtk_widget_show(button);
button = gtk_button_new_with_label("Cancel");
button = gtk_button_new_with_label(_("Cancel"));
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
(GtkSignalFunc) dialog_cancel_callback,

27
plug-ins/common/bz2.c
View File

@ -47,6 +47,9 @@
#endif
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
static void query (void);
static void run (char *name,
@ -144,6 +147,8 @@ run (char *name,
GStatusType status = STATUS_SUCCESS;
gint32 image_ID;
INIT_I18N();
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
@ -285,24 +290,24 @@ save_image (char *filename,
/* fork off a bzip2 process */
if ((pid = fork()) < 0)
{
g_message ("bz2: fork failed: %s\n", g_strerror(errno));
g_message (_("bz2: fork failed: %s\n"), g_strerror(errno));
return -1;
}
else if (pid == 0)
{
if (!(f = fopen(filename,"w"))){
g_message("bz2: fopen failed: %s\n", g_strerror(errno));
g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno));
_exit(127);
}
/* make stdout for this process be the output file */
if (-1 == dup2(fileno(f),fileno(stdout)))
g_message ("bz2: dup2 failed: %s\n", g_strerror(errno));
g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno));
/* and bzip2 into it */
execlp ("bzip2", "bzip2", "-cf", tmpname, NULL);
g_message ("bz2: exec failed: bzip2: %s\n", g_strerror(errno));
g_message (_("bz2: exec failed: bzip2: %s\n"), g_strerror(errno));
_exit(127);
}
else
@ -316,7 +321,7 @@ save_image (char *filename,
if (!WIFEXITED(status) ||
WEXITSTATUS(status) != 0)
{
g_message ("bz2: bzip2 exited abnormally on file %s\n", tmpname);
g_message (_("bz2: bzip2 exited abnormally on file %s\n"), tmpname);
return 0;
}
}
@ -350,24 +355,24 @@ load_image (char *filename, gint32 run_mode)
/* fork off a g(un)zip and wait for it */
if ((pid = fork()) < 0)
{
g_message ("bz2: fork failed: %s\n", g_strerror(errno));
g_message (_("bz2: fork failed: %s\n"), g_strerror(errno));
return -1;
}
else if (pid == 0) /* child process */
{
FILE* f;
if (!(f = fopen(tmpname,"w"))){
g_message("bz2: fopen failed: %s\n", g_strerror(errno));
g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno));
_exit(127);
}
/* make stdout for this child process be the temp file */
if (-1 == dup2(fileno(f),fileno(stdout)))
g_message ("bz2: dup2 failed: %s\n", g_strerror(errno));
g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno));
/* and unzip into it */
execlp ("bzip2", "bzip2", "-cfd", filename, NULL);
g_message ("bz2: exec failed: bunzip2: %s\n", g_strerror(errno));
g_message (_("bz2: exec failed: bunzip2: %s\n"), g_strerror(errno));
_exit(127);
}
else /* parent process */
@ -381,7 +386,7 @@ load_image (char *filename, gint32 run_mode)
if (!WIFEXITED(status) ||
WEXITSTATUS(status) != 0)
{
g_message ("bz2: bzip2 exited abnormally on file %s\n", filename);
g_message (_("bz2: bzip2 exited abnormally on file %s\n"), filename);
return -1;
}
}
@ -435,7 +440,7 @@ static char* find_extension (char* filename)
while (1) {
if (!ext || ext[1] == 0 || strchr(ext, '/'))
{
g_message ("bz2: can't open bzip2ed file without a sensible extension\n");
g_message (_("bz2: can't open bzip2ed file without a sensible extension\n"));
return NULL;
}
if (0 == strcmp(ext, ".xcfbz2")) {

25
plug-ins/common/checkerboard.c
View File

@ -24,6 +24,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Variables set in dialog box */
typedef struct data {
gint mode;
@ -88,13 +91,15 @@ query ()
static int nargs = sizeof (args) / sizeof (args[0]);
static int nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_checkerboard",
"Adds a checkerboard pattern to an image",
_("Adds a checkerboard pattern to an image"),
"More here later",
"Brent Burton & the Edward Blevins",
"Brent Burton & the Edward Blevins",
"1997",
"<Image>/Filters/Render/Checkerboard",
_("<Image>/Filters/Render/Checkerboard"),
"RGB*, GRAY*",
PROC_PLUG_IN,
nargs, nreturn_vals,
@ -113,6 +118,8 @@ run (gchar *name,
GRunModeType run_mode;
GStatusType status = STATUS_SUCCESS;
INIT_I18N();
run_mode = param[0].data.d_int32;
*nreturn_vals = 1;
@ -154,7 +161,7 @@ run (gchar *name,
if (gimp_drawable_color (drawable->id) || gimp_drawable_gray (drawable->id))
{
gimp_progress_init ("Adding Checkerboard...");
gimp_progress_init (_("Adding Checkerboard..."));
check (drawable);
@ -364,14 +371,14 @@ check_dialog ()
gtk_rc_parse (gimp_gtkrc ());
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), "Checkerboard");
gtk_window_set_title (GTK_WINDOW (dlg), _("Checkerboard"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) check_close_callback,
NULL);
/* Action area */
button = gtk_button_new_with_label ("OK");
button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) check_ok_callback,
@ -380,7 +387,7 @@ check_dialog ()
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -389,7 +396,7 @@ check_dialog ()
gtk_widget_show (button);
/* parameter settings */
frame = gtk_frame_new ("Parameter Settings");
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
@ -397,7 +404,7 @@ check_dialog ()
gtk_container_border_width (GTK_CONTAINER (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);
toggle = gtk_check_button_new_with_label ("Psychobilly");
toggle = gtk_check_button_new_with_label (_("Psychobilly"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) check_toggle_update,
@ -405,7 +412,7 @@ check_dialog ()
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cvals.mode);
gtk_widget_show (toggle);
label = gtk_label_new ("Check Size");
label = gtk_label_new (_("Check Size"));
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
gtk_widget_show (label);

28
plug-ins/common/colorify.c
View File

@ -34,6 +34,9 @@
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_NAME "Colorify"
#define PLUG_IN_VERSION "1.1"
@ -113,11 +116,14 @@ query ()
static int nargs = sizeof(args) / sizeof(args[0]),
nreturn_vals = 0;
INIT_I18N();
gimp_install_procedure ("plug_in_colorify",
"Similar to the \"Color\" mode for layers.",
"Makes an average of the RGB channels and uses it to set the color",
_("Similar to the \"Color\" mode for layers."),
_("Makes an average of the RGB channels and uses it to set the color"),
"Francisco Bustamante", "Francisco Bustamante",
"0.0.1", "<Image>/Filters/Colors/Colorify", "RGB",
"0.0.1",
_("<Image>/Filters/Colors/Colorify"), "RGB",
PROC_PLUG_IN,
nargs, nreturn_vals,
args, return_vals);
@ -140,6 +146,8 @@ run (char *name,
static GParam values[1];
GDrawable *drawable;
INIT_I18N();
status = STATUS_SUCCESS;
run_mode = param[0].data.d_int32;
@ -183,7 +191,7 @@ run (char *name,
}
if (status == STATUS_SUCCESS) {
gimp_progress_init("Colorifying...");
gimp_progress_init(_("Colorifying..."));
colorify (drawable);
@ -293,13 +301,13 @@ colorify_dialog (guchar red,
gtk_rc_parse (gimp_gtkrc());
dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dialog), "Colorify");
gtk_window_set_title (GTK_WINDOW (dialog), _("Colorify"));
gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
(GtkSignalFunc) close_callback,
NULL);
button = gtk_button_new_with_label ("Ok");
button = gtk_button_new_with_label (_("Ok"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) colorify_ok_callback,
@ -308,7 +316,7 @@ colorify_dialog (guchar red,
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Cancel");
button = gtk_button_new_with_label (_("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
@ -316,7 +324,7 @@ colorify_dialog (guchar red,
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, TRUE, TRUE, 0);
gtk_widget_show (button);
frame = gtk_frame_new ("Color");
frame = gtk_frame_new (_("Color"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE, 0);
@ -329,7 +337,7 @@ colorify_dialog (guchar red,
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_widget_show (table);
label = gtk_label_new ("Custom Color: ");
label = gtk_label_new (_("Custom Color: "));
gtk_table_attach (GTK_TABLE (table), label, 4, 6, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@ -419,7 +427,7 @@ custom_color_callback (GtkWidget *widget,
GtkColorSelectionDialog *csd;
gdouble colour[3];
c_dialog = gtk_color_selection_dialog_new ("Colorify Custom Color");
c_dialog = gtk_color_selection_dialog_new (_("Colorify Custom Color"));
csd = GTK_COLOR_SELECTION_DIALOG (c_dialog);
gtk_color_selection_set_update_policy (GTK_COLOR_SELECTION(csd->colorsel),
GTK_UPDATE_DISCONTINUOUS);

Some files were not shown because too many files have changed in this diff Show More