diff --git a/ChangeLog b/ChangeLog
index 57f75feb..086140c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-06  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* examples/smp.c: (main): Removed translation.
+
+	* lib/lib.pl:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* src/daemon/gnuserv.c: s/gi18n.h/gi18n-lib.h.
+
 2005-06-06  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* acinclude.m4: bye bye support.
diff --git a/examples/smp.c b/examples/smp.c
index f871522b..dcc8d92f 100644
--- a/examples/smp.c
+++ b/examples/smp.c
@@ -31,8 +31,6 @@
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 
-#include <glib/gi18n.h>"
-
 int
 main (int argc, char *argv [])
 {
@@ -44,10 +42,6 @@ main (int argc, char *argv [])
 	char separator [BUFSIZ], buffer [BUFSIZ];
 	int ncpu, i;
 
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
 	glibtop_init();
 
 	glibtop_get_cpu (&cpu);
@@ -73,16 +67,16 @@ main (int argc, char *argv [])
 	memset (separator, '-', 91);
 	separator [92] = '\0';
 
-	sprintf (buffer, _("Ticks (%ld per second):"), frequency);
+	sprintf (buffer, "Ticks (%ld per second):", frequency);
 
 	printf ("\n\n%-26s %12s %12s %12s %12s %12s\n%s\n", buffer,
-		_("Total"), _("User"), _("Nice"), _("Sys"), _("Idle"), separator);
+		"Total", "User", "Nice", "Sys", "Idle", separator);
 
-	printf (_("CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n\n"),
+	printf ("CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n\n",
 		(unsigned long) cpu.flags, total, user, nice, sys, idle);
 
 	for (i = 0; i < glibtop_global_server->ncpu; i++) {
-		printf (_("CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"), i,
+		printf ("CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n", i,
 			(unsigned long) cpu.flags,
 			(unsigned long) cpu.xcpu_total [i],
 			(unsigned long) cpu.xcpu_user  [i],
@@ -99,11 +93,11 @@ main (int argc, char *argv [])
 
 	printf ("%s\n\n\n", separator);
 
-	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
-		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
-		_("Idle (%)"), separator);
+	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", "Percent:",
+		"Total (%)", "User (%)", "Nice (%)", "Sys (%)",
+		"Idle (%)", separator);
 
-	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
+	printf ("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n",
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,
 		(double) nice  * 100.0 / total,
@@ -119,13 +113,13 @@ main (int argc, char *argv [])
 		p_sys   = ((double) cpu.xcpu_sys   [i]) * 100.0 / sys;
 		p_idle  = ((double) cpu.xcpu_idle  [i]) * 100.0 / idle;
 
-		printf (_("CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"),
+		printf ("CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n",
 			i, (unsigned long) cpu.flags, p_total, p_user, p_nice,
 			p_sys, p_idle);
 	}
 
 	printf ("%s\n%-26s %12.3f %12.3f %12.3f %12.3f %12.3f\n\n", separator,
-		_("Spin:"), s_total * 100.0 / total, s_user * 100.0 / user,
+		"Spin:", s_total * 100.0 / total, s_user * 100.0 / user,
 		s_nice * 100.0 / nice, s_sys * 100.0 / sys, s_idle * 100.0 / idle);
 
 	exit (0);
diff --git a/lib/lib.pl b/lib/lib.pl
index 6cf01f94..fe82170f 100755
--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -28,7 +28,7 @@ print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
-print '#include <glib/gi18n.h>';
+print '#include <glib/gi18n-lib.h>';
 print '';
 print '#include <glibtop/command.h>';
 
diff --git a/lib/read.c b/lib/read.c
index bcb8d137..e0efdbaf 100644
--- a/lib/read.c
+++ b/lib/read.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <glibtop/read.h>
 #include <glibtop/error.h>
-#include <glib/gi18n.h>"
+#include <glib/gi18n-lib.h>
 
 
 /* Reads some data from server. */
diff --git a/lib/read_data.c b/lib/read_data.c
index 14db4c71..e5fce4c0 100644
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -25,7 +25,7 @@
 
 #include <glibtop/error.h>
 #include <glibtop/read_data.h>
-#include <glib/gi18n.h>"
+#include <glib/gi18n-lib.h>
 
 /* Reads some data from server. */
 
diff --git a/lib/write.c b/lib/write.c
index 558d23a7..17cb5093 100644
--- a/lib/write.c
+++ b/lib/write.c
@@ -25,7 +25,7 @@
 
 #include <glibtop/write.h>
 #include <glibtop/error.h>
-#include <glib/gi18n.h>"
+#include <glib/gi18n-lib.h>
 
 /* Writes some data to server. */
 
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 96ade3e3..ea61ded1 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -31,7 +31,7 @@
 
 #include <config.h>
 
-#include <glib/gi18n.h>"
+#include <glib/gi18n-lib.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>