1.1 --- a/gui/Makefile.am	Fri Apr 14 18:07:33 2006 +0000
     1.2 +++ b/gui/Makefile.am	Fri Apr 14 18:31:16 2006 +0000
     1.3 @@ -40,6 +40,7 @@
     1.4  	gui_writer.cc \
     1.5  	xml.h \
     1.6  	guipixbufs.h \
     1.7 +	i18n.h \
     1.8  	gettext.h
     1.9  
    1.10  glemon_CXXFLAGS = $(GTK_CFLAGS)

     2.1 --- a/gui/graph-displayer.cc	Fri Apr 14 18:07:33 2006 +0000
     2.2 +++ b/gui/graph-displayer.cc	Fri Apr 14 18:31:16 2006 +0000
     2.3 @@ -9,7 +9,6 @@
     2.4  #include <libgnomecanvasmm/polygon.h>
     2.5  
     2.6  #include <locale.h>
     2.7 -#include "gettext.h"
     2.8  
     2.9  #define MAIN_PART
    2.10  
    2.11 @@ -21,6 +20,7 @@
    2.12  
    2.13  int main(int argc, char *argv[])
    2.14  {
    2.15 +  setlocale(LC_ALL, "");
    2.16    bindtextdomain(PACKAGE, LOCALEDIR);
    2.17    bind_textdomain_codeset(PACKAGE, "UTF-8");
    2.18    textdomain(PACKAGE);

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/gui/i18n.h	Fri Apr 14 18:31:16 2006 +0000
     3.3 @@ -0,0 +1,7 @@
     3.4 +#ifndef I18N_H
     3.5 +#define I18N_H
     3.6 +
     3.7 +#include "gettext.h"
     3.8 +#define _(string) gettext (string)
     3.9 +
    3.10 +#endif

     4.1 --- a/gui/main_win.cc	Fri Apr 14 18:07:33 2006 +0000
     4.2 +++ b/gui/main_win.cc	Fri Apr 14 18:31:16 2006 +0000
     4.3 @@ -5,8 +5,7 @@
     4.4  #include "main_win.h"
     4.5  #include "guipixbufs.h"
     4.6  
     4.7 -#include "gettext.h"
     4.8 -#define _(string) gettext (string)
     4.9 +#include "i18n.h"
    4.10  
    4.11  MainWin::MainWin()
    4.12  {