initial merge of the internationalization stuff. It's still broken in a

* initial merge of the internationalization stuff. It's still broken in a
couple places, so you're probably better off running configure with
--disable-nls (gimp-mgomulin-980727-0)

-Yosh

ABOUT-NLS

+Notes on the Free Translation Project
+*************************************
+
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do *not*
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+One advise in advance
+=====================
+
+   If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias or message inheritance) as the
+implementation here.  It is also not possible to offer this additional
+functionality on top of a `catgets' implementation.  Future versions of
+GNU `gettext' will very likely convey even more functionality.  So it
+might be a good idea to change to GNU `gettext' as soon as possible.
+
+   So you need not provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+   Some packages are "localizable" when properly installed; the
+programs they contain can be made to speak your own native language.
+Most such packages use GNU `gettext'.  Other packages have their own
+ways to internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system provides
+usable `catgets' (if using this is selected by the installer) or
+`gettext' functions.  If neither is available, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is *not* required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --with-catgets
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `catgets' or `gettext' to use
+the internationalizing routines provided within this package, enable
+the use of the `catgets' functions (if found on the locale system), or
+else, *totally* disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   By default the configuration process will not test for the `catgets'
+function and therefore they will not be used.  The reasons are already
+given above: the emulation on top of `catgets' cannot provide all the
+extensions provided by the GNU `gettext' library.  If you nevertheless
+want to use the `catgets' functions use
+
+     ./configure --with-catgets
+
+to enable the test for `catgets' (this causes no harm if `catgets' is
+not available on your system).  If you really select this option we
+would like to hear about the reasons because we cannot think of any
+good one ourself.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+   As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+ISO 639 `LL' two-letter code prior to using the programs in the
+package.  For example, let's suppose that you speak German.  At the
+shell prompt, merely execute `setenv LANG de' (in `csh'),
+`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
+can be done from your `.login' or `.profile' file, once and for all.
+
+   An operating system might already offer message localization for
+many of its programs, while other programs have been installed locally
+with the full capabilities of GNU `gettext'.  Just using `gettext'
+extended syntax for `LANG' would break proper localization of already
+available operating system programs.  In this case, users should set
+both `LANGUAGE' and `LANG' variables in their environment, as programs
+using GNU `gettext' give preference to `LANGUAGE'.  For example, some
+Swedish users would rather read translations in German than English for
+when Swedish is not available.  This is easily accomplished by setting
+`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
+
+Translating Teams
+=================
+
+   For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list, courtesy of Linux
+International.  You may reach your translation team at the address
+`LL@li.org', replacing LL by the two-letter ISO 639 code for your
+language.  Language codes are *not* the same as the country codes given
+in ISO 3166.  The following translation teams exist, as of August 1997:
+
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
+     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
+     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
+     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
+     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
+     Swedish `sv', and Turkish `tr'.
+
+For example, you may reach the Chinese translation team by writing to
+`zh@li.org'.
+
+   If you'd like to volunteer to *work* at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is *not* the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+*actively* in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of August
+1997.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination.
+
+     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt sl sv
+                     .-------------------------------------------------.
+     bash            |       []          []          []                |  3
+     bison           |       []          []          []                |  3
+     clisp           |       [] [] []    []                            |  4
+     cpio            |       []    []    []          []    []          |  5
+     diffutils       |       []    []    []                []       [] |  5
+     enscript        |       []    [] [] []          []          []    |  6
+     fileutils       | []    []    []    []       [] []    [] [] [] [] | 10
+     findutils       |       []    []    [] []    [] []    []       [] |  8
+     flex            |             []    []       []                [] |  4
+     gcal            |       []          []          []    []       [] |  5
+     gettext         |       []    []    []       [] [] [] [] [] [] [] | 11
+     grep            |       []    []    []       [] [] [] []    [] [] |  9
+     hello           |       []    []    []       [] [] [] [] [] [] [] | 10
+     id-utils        |       []          []                []          |  3
+     indent          |    [] []                   []       []          |  4
+     libc            |       []    []    []       [] []    []       [] |  7
+     m4              |       []          []    []    []             [] |  5
+     make            |       []    []    []       [] []    []          |  6
+     music           |                   []                []          |  2
+     ptx             |       []    []    []          [] [] [] []    [] |  8
+     recode          |    [] []    []    []          []    [] [] [] [] |  9
+     sh-utils        |       []          []          [] [] [] []    [] |  7
+     sharutils       |       []    []    []          []             [] |  5
+     tar             |       []          [] []    [] [] [] [] [] [] [] | 10
+     texinfo         |                   []                            |  1
+     textutils       | []    []    []    []       [] [] [] []       [] |  9
+     wdiff           | []    []    []    []          [] [] []       [] |  8
+                     `-------------------------------------------------'
+       16 languages    cs da de en es fi fr it ja ko nl no pl pt sl sv
+       27 packages      3  2 24  1 17  1 26  2  1 11 20  9 19  7  7 17  167
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If August 1997 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.
+

ChangeLog

+Wed Aug  5 16:29:05 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* initial merge of the internationalization stuff. It's still
+	broken in a couple places, so you're probably better off running
+	configure with --disable-nls (gimp-mgomulin-980727-0)
+
 Wed Aug  5 23:31:54 MEST 1998 Sven Neumann <sven@gimp.org>
 
 	* plug-ins/script-fu/scripts/*.scm (well, almost): Changed all

Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = libgimp plug-ins app data
+SUBDIRS = po intl libgimp plug-ins app data
 
 bin_SCRIPTS = gimptool
 

acconfig.h

@@ -14,9 +14,13 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
 #undef HAVE_DIRENT_H
 #undef HAVE_DOPRNT
+#undef HAVE_GETTEXT
 #undef HAVE_IPC_H
+#undef HAVE_LC_MESSAGES
 #undef HAVE_NDIR_H
 #undef HAVE_SHM_H
 #undef HAVE_SYS_DIR_H

app/Makefile.am

@@ -326,6 +326,7 @@ CPPFLAGS = \
 
 INCLUDES = \
 	-I$(top_srcdir)			\
+	-I$(top_srcdir)/intl		\
 	$(GTK_CFLAGS)			\
 	-I$(includedir)
 

app/about_dialog.c

@@ -23,6 +23,8 @@
 
 #include "libgimp/gimpfeatures.h"
 
+#include "libgimp/gimpintl.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
@@ -139,12 +141,13 @@ about_dialog_create (int timeout)
   GtkWidget *alignment;
   gint max_width;
   gint i;
+  gchar *label_text;
 
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
       gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
-      gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
+      gtk_window_set_title (GTK_WINDOW (about_dialog), _("About the GIMP"));
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (about_dialog), "destroy",
@@ -187,14 +190,18 @@ about_dialog_create (int timeout)
 
       style = gtk_style_new ();
       gdk_font_unref (style->font);
-      style->font = gdk_font_load ("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*");
+      style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label = gtk_label_new ("Version " GIMP_VERSION " brought to you by");
+      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
+			  strlen(_(" brought to you by")) * sizeof(gchar));
+      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label = gtk_label_new (label_text);
+      g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
-      label = gtk_label_new ("Spencer Kimball and Peter Mattis");
+      label = gtk_label_new (_("Spencer Kimball and Peter Mattis"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
@@ -227,7 +234,7 @@ about_dialog_create (int timeout)
       gtk_container_add (GTK_CONTAINER (aboutframe), scroll_area);
       gtk_widget_show (scroll_area);
 
-      label = gtk_label_new ("Please visit http://www.gimp.org/ for more info");
+      label = gtk_label_new (_("Please visit http://www.gimp.org/ for more info"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 

app/dialogs/about-dialog.c

@@ -23,6 +23,8 @@
 
 #include "libgimp/gimpfeatures.h"
 
+#include "libgimp/gimpintl.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
@@ -139,12 +141,13 @@ about_dialog_create (int timeout)
   GtkWidget *alignment;
   gint max_width;
   gint i;
+  gchar *label_text;
 
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
       gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
-      gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
+      gtk_window_set_title (GTK_WINDOW (about_dialog), _("About the GIMP"));
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (about_dialog), "destroy",
@@ -187,14 +190,18 @@ about_dialog_create (int timeout)
 
       style = gtk_style_new ();
       gdk_font_unref (style->font);
-      style->font = gdk_font_load ("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*");
+      style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label = gtk_label_new ("Version " GIMP_VERSION " brought to you by");
+      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
+			  strlen(_(" brought to you by")) * sizeof(gchar));
+      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label = gtk_label_new (label_text);
+      g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
-      label = gtk_label_new ("Spencer Kimball and Peter Mattis");
+      label = gtk_label_new (_("Spencer Kimball and Peter Mattis"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
@@ -227,7 +234,7 @@ about_dialog_create (int timeout)
       gtk_container_add (GTK_CONTAINER (aboutframe), scroll_area);
       gtk_widget_show (scroll_area);
 
-      label = gtk_label_new ("Please visit http://www.gimp.org/ for more info");
+      label = gtk_label_new (_("Please visit http://www.gimp.org/ for more info"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 

app/gui/about-dialog.c

@@ -23,6 +23,8 @@
 
 #include "libgimp/gimpfeatures.h"
 
+#include "libgimp/gimpintl.h"
+
 #include "about_dialog.h"
 #include "interface.h"
 
@@ -139,12 +141,13 @@ about_dialog_create (int timeout)
   GtkWidget *alignment;
   gint max_width;
   gint i;
+  gchar *label_text;
 
   if (!about_dialog)
     {
       about_dialog = gtk_window_new (GTK_WINDOW_DIALOG);
       gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "Gimp");
-      gtk_window_set_title (GTK_WINDOW (about_dialog), "About the GIMP");
+      gtk_window_set_title (GTK_WINDOW (about_dialog), _("About the GIMP"));
       gtk_window_set_policy (GTK_WINDOW (about_dialog), FALSE, FALSE, FALSE);
       gtk_window_position (GTK_WINDOW (about_dialog), GTK_WIN_POS_CENTER);
       gtk_signal_connect (GTK_OBJECT (about_dialog), "destroy",
@@ -187,14 +190,18 @@ about_dialog_create (int timeout)
 
       style = gtk_style_new ();
       gdk_font_unref (style->font);
-      style->font = gdk_font_load ("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*");
+      style->font = gdk_font_load (_("-Adobe-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*"));
       gtk_widget_push_style (style);
 
-      label = gtk_label_new ("Version " GIMP_VERSION " brought to you by");
+      label_text=g_malloc(strlen(_("Version ")) + strlen(GIMP_VERSION) + 
+			  strlen(_(" brought to you by")) * sizeof(gchar));
+      sprintf(label_text, "%s%s%s", _("Version "), GIMP_VERSION, _(" brought to you by"));
+      label = gtk_label_new (label_text);
+      g_free(label_text); label_text=NULL;
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
-      label = gtk_label_new ("Spencer Kimball and Peter Mattis");
+      label = gtk_label_new (_("Spencer Kimball and Peter Mattis"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 
@@ -227,7 +234,7 @@ about_dialog_create (int timeout)
       gtk_container_add (GTK_CONTAINER (aboutframe), scroll_area);
       gtk_widget_show (scroll_area);
 
-      label = gtk_label_new ("Please visit http://www.gimp.org/ for more info");
+      label = gtk_label_new (_("Please visit http://www.gimp.org/ for more info"));
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
       gtk_widget_show (label);
 

app/main.c

@@ -36,6 +36,8 @@
 #include "errors.h"
 #include "install.h"
 
+#include "libgimp/gimpintl.h"
+
 static RETSIGTYPE on_signal (int);
 static RETSIGTYPE on_sig_child (int);
 static void       init (void);
@@ -97,6 +99,14 @@ main (int argc, char **argv)
   /* Initialize Gtk toolkit */
   gtk_set_locale ();
   setlocale(LC_NUMERIC, "C");  /* must use dot, not comma, as decimal separator */
+  /* Initialize i18n support */
+
+#ifdef HAVE_LC_MESSAGES
+  setlocale(LC_MESSAGES, "");
+#endif
+  bindtextdomain("gimp", LOCALEDIR);
+  textdomain("gimp");
+
   gtk_init (&argc, &argv);
 
 #ifdef HAVE_LIBGLE
@@ -224,28 +234,28 @@ main (int argc, char **argv)
     }
 
   if (show_version)
-    g_print ("GIMP version " GIMP_VERSION "\n");
+    g_print ( "%s %s\n", _("GIMP version"), GIMP_VERSION);
 
   if (show_help)
     {
-      g_print ("\007Usage: %s [option ...] [files ...]\n", argv[0]);
-      g_print ("Valid options are:\n");
-      g_print ("  -h --help                Output this help.\n");
-      g_print ("  -v --version             Output version info.\n");
-      g_print ("  -b --batch <commands>    Run in batch mode.\n");
-      g_print ("  -g --gimprc <gimprc>     Use an alternate gimprc file.\n");
-      g_print ("  -n --no-interface        Run without a user interface.\n");
-      g_print ("  -r --restore-session     Try to restore saved session.\n");
-      g_print ("  --no-data                Do not load patterns, gradients, palettes, brushes.\n");
-      g_print ("  --verbose                Show startup messages.\n");
-      g_print ("  --no-splash              Do not show the startup window.\n");
-      g_print ("  --no-splash-image        Do not add an image to the startup window.\n");
-      g_print ("  --no-shm                 Do not use shared memory between GIMP and its plugins.\n");
-      g_print ("  --no-xshm                Do not use the X Shared Memory extension.\n");
-      g_print ("  --console-messages       Display warnings to console instead of a dialog box.\n");
-      g_print ("  --debug-handlers         Enable debugging signal handlers.\n");
-      g_print ("  --display <display>      Use the designated X display.\n\n");
-      g_print ("  --system-gimprc <gimprc> Use an alternate system gimprc file.\n");
+      g_print (_("\007Usage: %s [option ...] [files ...]\n"), argv[0]);
+      g_print (_("Valid options are:\n"));
+      g_print (_("  -h --help                Output this help.\n"));
+      g_print (_("  -v --version             Output version info.\n"));
+      g_print (_("  -b --batch <commands>    Run in batch mode.\n"));
+      g_print (_("  -g --gimprc <gimprc>     Use an alternate gimprc file.\n"));
+      g_print (_("  -n --no-interface        Run without a user interface.\n"));
+      g_print (_("  -r --restore-session     Try to restore saved session.\n"));
+      g_print (_("  --no-data                Do not load patterns, gradients, palettes, brushes.\n"));
+      g_print (_("  --verbose                Show startup messages.\n"));
+      g_print (_("  --no-splash              Do not show the startup window.\n"));
+      g_print (_("  --no-splash-image        Do not add an image to the startup window.\n"));
+      g_print (_("  --no-shm                 Do not use shared memory between GIMP and its plugins.\n"));
+      g_print (_("  --no-xshm                Do not use the X Shared Memory extension.\n"));
+      g_print (_("  --console-messages       Display warnings to console instead of a dialog box.\n"));
+      g_print (_("  --debug-handlers         Enable debugging signal handlers.\n"));
+      g_print (_("  --display <display>      Use the designated X display.\n\n"));
+      g_print (_("  --system-gimprc <gimprc> Use an alternate system gimprc file.\n"));
     }
 
   if (show_version || show_help)
@@ -301,34 +311,34 @@ on_signal (int sig_num)
   switch (sig_num)
     {
     case SIGHUP:
-      terminate ("sighup caught");
+      terminate (_("sighup caught"));
       break;
     case SIGINT:
-      terminate ("sigint caught");
+      terminate (_("sigint caught"));
       break;
     case SIGQUIT:
-      terminate ("sigquit caught");
+      terminate (_("sigquit caught"));
       break;
     case SIGABRT:
-      terminate ("sigabrt caught");
+      terminate (_("sigabrt caught"));
       break;
     case SIGBUS:
-      fatal_error ("sigbus caught");
+      fatal_error (_("sigbus caught"));
       break;
     case SIGSEGV:
-      fatal_error ("sigsegv caught");
+      fatal_error (_("sigsegv caught"));
       break;
     case SIGPIPE:
-      terminate ("sigpipe caught");
+      terminate (_("sigpipe caught"));
       break;
     case SIGTERM:
-      terminate ("sigterm caught");
+      terminate (_("sigterm caught"));
       break;
     case SIGFPE:
-      fatal_error ("sigfpe caught");
+      fatal_error (_("sigfpe caught"));
       break;
     default:
-      fatal_error ("unknown signal");
+      fatal_error (_("unknown signal"));
       break;
     }
 }

config.h.in

@@ -49,9 +49,13 @@
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
 #undef HAVE_DIRENT_H
 #undef HAVE_DOPRNT
+#undef HAVE_GETTEXT
 #undef HAVE_IPC_H
+#undef HAVE_LC_MESSAGES
 #undef HAVE_NDIR_H
 #undef HAVE_SHM_H
 #undef HAVE_SYS_DIR_H

configure.in

@@ -54,12 +54,18 @@ fi
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 
+dnl i18n stuff
+ALL_LINGUAS=""
+AM_GNU_GETTEXT
+AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+
 dnl Check for GTK+
 AM_PATH_GTK(1.1.0,,
   AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
@@ -450,12 +456,14 @@ AC_SUBST(THREAD_LIBS)
 
 dnl Output the Makefiles
 
-AC_OUTPUT(
-Makefile
+AC_OUTPUT([
 gimprc
 gimprc_user
 gimptool
 libgimp/gimpfeatures.h
+Makefile
+po/Makefile.in
+intl/Makefile
 libgimp/Makefile
 plug-ins/Makefile
 plug-ins/libgck/Makefile
@@ -597,6 +605,7 @@ data/Makefile
 data/brushes/Makefile
 data/gradients/Makefile
 data/palettes/Makefile
-data/patterns/Makefile,
-chmod +x gimptool
+data/patterns/Makefile],
+[chmod +x gimptool
+sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]
 )

libgimp/Makefile.am

@@ -42,7 +42,8 @@ gimpinclude_HEADERS = \
 	gimpenums.h	\
 	gimpfeatures.h	\
 	gimpmenu.h	\
-	gimpui.h
+	gimpui.h	\
+	gimpintl.h
 
 libgimp_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 libgimpui_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -52,11 +53,14 @@ CPPFLAGS = \
 
 INCLUDES = \
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/intl	\
+	-I../intl		\
 	$(GTK_CFLAGS)		\
 	-I$(includedir)
 
 libgimpui_1_1_la_INCLUDES = \
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/intl	\
 	$(GTK_CFLAGS)		\
 	-I$(includedir)
 

libgimp/gimpintl.h

+#ifndef __GIMPINTL_H__
+#define __GIMPINTL_H__
+
+#define LOCALEDIR LIBDIR "/locale"
+
+/* Copied from gnome-i18n.h by Tom Tromey <tromey@creche.cygnus.com> */
+
+#ifdef ENABLE_NLS
+#include<libintl.h>
+#define _(String) gettext(String)
+#ifdef gettext_noop
+#define N_(String) gettext_noop(String)
+#else
+#define N_(String) (String)
+#endif
+#else /* NLS is disabled */
+#define _(String) (String)
+#define N_(String) (String)
+#define textdomain(String) (String)
+#define gettext(String) (String)
+#define dgettext(Domain,String) (String)
+#define dcgettext(Domain,String,Type) (String)
+#define bindtextdomain(Domain,Directory) (Domain) 
+#endif
+
+
+#endif

po/.cvsignore

+*.gmo
+*.mo
+Makefile
+Makefile.in
+POTFILES
+cat-id-tbl.c
+gimp.pot
+stamp-cat-id