Commit f2622e54 authored by Manish Singh's avatar Manish Singh

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
parent 392b7d14
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> 1999-05-29 Tuomas Kuosmanen <tigert@gimp.org>
* gimp1_1_splash.ppm: New splash - enjoy while it lasts.. * gimp1_1_splash.ppm: New splash - enjoy while it lasts..
......
## Process this file with automake to produce Makefile.in ## 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 bin_SCRIPTS = gimptool
...@@ -67,7 +67,6 @@ EXTRA_DIST = \ ...@@ -67,7 +67,6 @@ EXTRA_DIST = \
rmshm \ rmshm \
user_install \ user_install \
user_install.bat \ user_install.bat \
gimp_tips.txt \
ps-menurc \ ps-menurc \
gimp.1 \ gimp.1 \
gimptool.1 \ gimptool.1 \
...@@ -84,7 +83,6 @@ gimpdata_DATA = \ ...@@ -84,7 +83,6 @@ gimpdata_DATA = \
gimp_logo.ppm \ gimp_logo.ppm \
gimp_splash.ppm \ gimp_splash.ppm \
gimp1_1_splash.ppm \ gimp1_1_splash.ppm \
gimp_tips.txt \
ps-menurc \ ps-menurc \
gtkrc.forest2 gtkrc.forest2
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## configuration script generated by Autoconf, you may include it under ## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program. ## 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_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
...@@ -382,6 +382,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[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" ;; ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la 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 # 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 ...@@ -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 if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install" ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl" LIBLTDL="-lltdl"
INCLTDL=
fi fi
]) ])
...@@ -420,5 +423,5 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl ...@@ -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_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
dnl This is just to quiet aclocal about the macro not being used dnl This is just to silence aclocal about the macro not being used
ifelse(a,b,[AC_DISABLE_FAST_INSTALL])dnl ifelse([AC_DISABLE_FAST_INSTALL])dnl
...@@ -202,7 +202,7 @@ make_seg (int x1, ...@@ -202,7 +202,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs); sizeof (BoundSeg) * max_segs);
if (!tmp_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; tmp_segs[num_segs].x1 = x1;
...@@ -244,7 +244,7 @@ allocate_empty_segs (void) ...@@ -244,7 +244,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs); empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c) 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, ...@@ -499,7 +499,7 @@ sort_boundary (BoundSeg *segs,
} }
if (x != startx || y != starty) 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 */ /* Mark the end of a group */
*num_groups = *num_groups + 1; *num_groups = *num_groups + 1;
......
...@@ -620,7 +620,7 @@ static void ...@@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd) color_balance_preview (ColorBalanceDialog *cbd)
{ {
if (!cbd->image_map) if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map")); g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE; active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd); color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd); image_map_apply (cbd->image_map, color_balance, (void *) cbd);
......
...@@ -988,7 +988,7 @@ static void ...@@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd) curves_preview (CurvesDialog *cd)
{ {
if (!cd->image_map) 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... */ active_tool->preserve = TRUE; /* Going to dirty the display... */
......
...@@ -202,7 +202,7 @@ make_seg (int x1, ...@@ -202,7 +202,7 @@ make_seg (int x1,
sizeof (BoundSeg) * max_segs); sizeof (BoundSeg) * max_segs);
if (!tmp_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; tmp_segs[num_segs].x1 = x1;
...@@ -244,7 +244,7 @@ allocate_empty_segs (void) ...@@ -244,7 +244,7 @@ allocate_empty_segs (void)
empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs); empty_segs_l = (int *) g_realloc (empty_segs_l, sizeof (int) * max_empty_segs);
if (!empty_segs_n || !empty_segs_l || !empty_segs_c) 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, ...@@ -499,7 +499,7 @@ sort_boundary (BoundSeg *segs,
} }
if (x != startx || y != starty) 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 */ /* Mark the end of a group */
*num_groups = *num_groups + 1; *num_groups = *num_groups + 1;
......
...@@ -416,7 +416,7 @@ static void ...@@ -416,7 +416,7 @@ static void
brightness_contrast_preview (BrightnessContrastDialog *bcd) brightness_contrast_preview (BrightnessContrastDialog *bcd)
{ {
if (!bcd->image_map) if (!bcd->image_map)
g_message (_("brightness_contrast_preview(): No image map")); g_message ("brightness_contrast_preview(): No image map");
active_tool->preserve = TRUE; active_tool->preserve = TRUE;
brightness_contrast_lut_setup(bcd->lut, bcd->brightness / 255.0, brightness_contrast_lut_setup(bcd->lut, bcd->brightness / 255.0,
bcd->contrast / 127.0, bcd->contrast / 127.0,
......
...@@ -634,7 +634,8 @@ by_color_select_new_dialog () ...@@ -634,7 +634,8 @@ by_color_select_new_dialog ()
/* the radio buttons */ /* the radio buttons */
for (i = 0; i < (sizeof(button_names) / sizeof(button_names[0])); i++) 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)); group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_box_pack_start (GTK_BOX (radio_box), radio_button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (radio_box), radio_button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled", gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
......
...@@ -620,7 +620,7 @@ static void ...@@ -620,7 +620,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd) color_balance_preview (ColorBalanceDialog *cbd)
{ {
if (!cbd->image_map) if (!cbd->image_map)
g_message (_("color_balance_preview(): No image map")); g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE; active_tool->preserve = TRUE;
color_balance_create_lookup_tables(cbd); color_balance_create_lookup_tables(cbd);
image_map_apply (cbd->image_map, color_balance, (void *) cbd); image_map_apply (cbd->image_map, color_balance, (void *) cbd);
......
...@@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj, ...@@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
goto got_colour; goto got_colour;
} }
} }
g_error (_("Non-existant colour was expected to " g_error ("Non-existant colour was expected to "
"be in non-destructive colourmap.")); "be in non-destructive colourmap.");
got_colour: got_colour:
dest[INDEXED_PIX] = lastindex; dest[INDEXED_PIX] = lastindex;
if (has_alpha) if (has_alpha)
......
...@@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj, ...@@ -2563,8 +2563,8 @@ median_cut_pass2_nodestruct_dither_rgb (QuantizeObj *quantobj,
goto got_colour; goto got_colour;
} }
} }
g_error (_("Non-existant colour was expected to " g_error ("Non-existant colour was expected to "
"be in non-destructive colourmap.")); "be in non-destructive colourmap.");
got_colour: got_colour:
dest[INDEXED_PIX] = lastindex; dest[INDEXED_PIX] = lastindex;
if (has_alpha) if (has_alpha)
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image) ...@@ -1028,7 +1028,7 @@ gimp_image_get_new_tattoo(GimpImage *image)
{ {
image->tattoo_state++; image->tattoo_state++;
if (image->tattoo_state <= 0) 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); return (image->tattoo_state);
} }
......
...@@ -216,7 +216,7 @@ gdisplay_format_title (GDisplay *gdisp, ...@@ -216,7 +216,7 @@ gdisplay_format_title (GDisplay *gdisp,
format++; format++;
switch (*format) { switch (*format) {
case 0: case 0:
g_warning (_("image-title-format string ended within %%-sequence")); g_warning ("image-title-format string ended within %%-sequence");
break; break;
case '%': case '%':
...@@ -264,7 +264,7 @@ gdisplay_format_title (GDisplay *gdisp, ...@@ -264,7 +264,7 @@ gdisplay_format_title (GDisplay *gdisp,
*/ */
default: 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;
} }
break; break;
...@@ -538,7 +538,7 @@ gdisplay_idlerender_init (GDisplay *gdisp) ...@@ -538,7 +538,7 @@ gdisplay_idlerender_init (GDisplay *gdisp)
{ {
if (gdisp->idle_render.update_areas == NULL) 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; return;
} }
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -988,7 +988,7 @@ static void ...@@ -988,7 +988,7 @@ static void
curves_preview (CurvesDialog *cd) curves_preview (CurvesDialog *cd)
{ {
if (!cd->image_map) 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... */ active_tool->preserve = TRUE; /* Going to dirty the display... */
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "libgimp/gimpintl.h" #include "libgimp/gimpintl.h"
#include "libgimp/gimpenv.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_dialog_hide (GtkWidget *widget, gpointer data);
static int tips_show_next (GtkWidget *widget, gpointer data); static int tips_show_next (GtkWidget *widget, gpointer data);
...@@ -51,8 +51,10 @@ tips_dialog_create () ...@@ -51,8 +51,10 @@ tips_dialog_create ()
if (tips_count == 0) if (tips_count == 0)
{ {
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S TIPS_DIR_NAME
gimp_data_directory (), TIPS_FILE_NAME); G_DIR_SEPARATOR_S "%s",
gimp_data_directory (),
_("gimp_tips.txt"));
read_tips_file (temp); read_tips_file (temp);
g_free (temp); g_free (temp);
} }
...@@ -252,7 +254,7 @@ read_tips_file (char *filename) ...@@ -252,7 +254,7 @@ read_tips_file (char *filename)
if (!fp) if (!fp)
{ {
store_tip (_("Your GIMP tips file appears to be missing!\n" 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.")); "GIMP data directory. Please check your installation."));
return; return;
} }
......
...@@ -122,127 +122,127 @@ install_help (InstallCallback callback) ...@@ -122,127 +122,127 @@ install_help (InstallCallback callback)
{ 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") }, { 1, N_("Copyright (C) 1995 Spencer Kimball and Peter Mattis\n") },
{ 0, "\n" }, { 0, "\n" },
{ 0, N_("This program is free software; you can redistribute it and/or modify\n") }, { 0, N_(
{ 0, N_("it under the terms of the GNU General Public License as published by\n") }, "This program is free software; you can redistribute it and/or modify\n"
{ 0, N_("the Free Software Foundation; either version 2 of the License, or\n") }, "it under the terms of the GNU General Public License as published by\n"
{ 0, N_("(at your option) any later version.\n") }, "the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n") },
{ 0, "\n" }, { 0, "\n" },
{ 0, N_("This program is distributed in the hope that it will be useful,\n") }, { 0, N_(
{ 0, N_("but WITHOUT ANY WARRANTY; without even the implied warranty of\n") }, "This program is distributed in the hope that it will be useful,\n"
{ 0, N_("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n") }, "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
{ 0, N_("See the GNU General Public License for more details.\n") }, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details.\n") },
{ 0, "\n" }, { 0, "\n" },
{ 0, N_("You should have received a copy of the GNU General Public License\n") }, { 0, N_(
{ 0, N_("along with this program; if not, write to the Free Software\n") }, "You should have received a copy of the GNU General Public License\n"
{ 0, N_("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\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" }, { 0, "\n\n" },
{ 2, N_("Personal GIMP Installation\n\n") }, { 2, N_("Personal GIMP Installation\n\n") },
{ 0, N_("For a proper GIMP installation, a subdirectory called\n") }, { 0, N_("For a proper GIMP installation, a subdirectory called\n") },
{ 1, NULL }, /* will be replaced with gimp_directory() */ { 1, NULL }, /* will be replaced with gimp_directory() */
{ 0, N_(" needs to be created. This\n") }, { 0, N_(" needs to be created. This\n"
{ 0, N_("subdirectory will contain a number of important files:\n\n") }, "subdirectory will contain a number of important files:\n\n") },
{ 1, N_("gimprc\n") }, { 1, N_("gimprc\n") },
{ 0, N_("\t\tThe gimprc is used to store personal preferences\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") }, "\t\tsuch as default GIMP behaviors & plug-in hotkeys.\n"
{ 0, N_("\t\tPaths to search for brushes, palettes, gradients\n") }, "\t\tPaths to search for brushes, palettes, gradients\n"
{ 0, N_("\t\tpatterns, plug-ins and modules are also configured here.\n") }, "\t\tpatterns, plug-ins and modules are also configured here.\n") },
{ 1, N_("unitrc\n") }, { 1, N_("unitrc\n") },
{ 0, N_("\t\tThe unitrc is used to store your user units database.\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") }, "\t\tYou can define additional units and use them just\n"
{ 0, N_("\t\tlike you use the built-in units inches, millimeters,\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") }, "\t\tpoints and picas. This file is overwritten each time\n"
{ 0, N_("\t\tyou quit the GIMP.\n") }, "\t\tyou quit the GIMP.\n") },
{ 1, N_("pluginrc\n") }, { 1, N_("pluginrc\n") },
{ 0, N_("\t\tPlug-ins and extensions are external programs run by\n") }, { 0, N_("\t\tPlug-ins and extensions are external programs run by\n"
{ 0, N_("\t\tthe GIMP which provide additional functionality.\n") }, "\t\tthe GIMP which provide additional functionality.\n"
{ 0, N_("\t\tThese programs are searched for at run-time and\n") }, "\t\tThese programs are searched for at run-time and\n"
{ 0, N_("\t\tinformation about their functionality and mod-times\n") }, "\t\tinformation about their functionality and mod-times\n"
{ 0, N_("\t\tis cached in this file. This file is intended to\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") }, "\t\tbe GIMP-readable only, and should not be edited.\n") },
{ 1, N_("brushes\n") }, { 1, N_("brushes\n") },
{ 0, N_("\t\tThis is a subdirectory which can be used to store\n") }, { 0, N_("\t\tThis is a subdirectory which can be used to store\n"