diff -ruN gnome-desktop-2.6.2.orig/configure gnome-desktop-2.6.2/configure
--- gnome-desktop-2.6.2.orig/configure	2004-06-18 15:19:17.658311744 -0400
+++ gnome-desktop-2.6.2/configure	2004-06-18 15:19:18.075248360 -0400
@@ -20654,7 +20654,7 @@
 
     fi
   fi
-     USE_NLS=yes
+     USE_NLS=no
 
 
     gt_cv_have_gettext=no
@@ -21711,7 +21711,7 @@
     if test "$gt_cv_have_gettext" = "yes" ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
+#define ENABLE_NLS 0
 _ACEOF
 
     fi
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/fdl/C/Makefile.in gnome-desktop-2.6.2/desktop-docs/fdl/C/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/fdl/C/Makefile.in	2004-06-18 15:19:17.681308248 -0400
+++ gnome-desktop-2.6.2/desktop-docs/fdl/C/Makefile.in	2004-06-18 15:19:18.154236352 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/fdl/Makefile.in gnome-desktop-2.6.2/desktop-docs/fdl/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/fdl/Makefile.in	2004-06-18 15:19:17.682308096 -0400
+++ gnome-desktop-2.6.2/desktop-docs/fdl/Makefile.in	2004-06-18 15:19:18.158235744 -0400
@@ -149,7 +149,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 
-SUBDIRS = C eu
+SUBDIRS = C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/fdl/eu/Makefile.in gnome-desktop-2.6.2/desktop-docs/fdl/eu/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/fdl/eu/Makefile.in	2004-06-18 15:19:17.682308096 -0400
+++ gnome-desktop-2.6.2/desktop-docs/fdl/eu/Makefile.in	2004-06-18 15:19:18.156236048 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/C/Makefile.in gnome-desktop-2.6.2/desktop-docs/gnome-feedback/C/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/C/Makefile.in	2004-06-18 15:19:17.685307640 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gnome-feedback/C/Makefile.in	2004-06-18 15:19:18.178232704 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -354,7 +353,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -362,7 +360,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/Makefile.in gnome-desktop-2.6.2/desktop-docs/gnome-feedback/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/Makefile.in	2004-06-18 15:19:17.686307488 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gnome-feedback/Makefile.in	2004-06-18 15:19:18.182232096 -0400
@@ -149,7 +149,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 
-SUBDIRS = C eu
+SUBDIRS = C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/eu/Makefile.in gnome-desktop-2.6.2/desktop-docs/gnome-feedback/eu/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gnome-feedback/eu/Makefile.in	2004-06-18 15:19:17.686307488 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gnome-feedback/eu/Makefile.in	2004-06-18 15:19:18.180232400 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -354,7 +353,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -362,7 +360,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gpl/C/Makefile.in gnome-desktop-2.6.2/desktop-docs/gpl/C/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gpl/C/Makefile.in	2004-06-18 15:19:17.682308096 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gpl/C/Makefile.in	2004-06-18 15:19:18.161235288 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gpl/Makefile.in gnome-desktop-2.6.2/desktop-docs/gpl/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gpl/Makefile.in	2004-06-18 15:19:17.683307944 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gpl/Makefile.in	2004-06-18 15:19:18.166234528 -0400
@@ -149,7 +149,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 
-SUBDIRS = C eu
+SUBDIRS = C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/gpl/eu/Makefile.in gnome-desktop-2.6.2/desktop-docs/gpl/eu/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/gpl/eu/Makefile.in	2004-06-18 15:19:17.683307944 -0400
+++ gnome-desktop-2.6.2/desktop-docs/gpl/eu/Makefile.in	2004-06-18 15:19:18.163234984 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/lgpl/C/Makefile.in gnome-desktop-2.6.2/desktop-docs/lgpl/C/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/lgpl/C/Makefile.in	2004-06-18 15:19:17.684307792 -0400
+++ gnome-desktop-2.6.2/desktop-docs/lgpl/C/Makefile.in	2004-06-18 15:19:18.168234224 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/lgpl/Makefile.in gnome-desktop-2.6.2/desktop-docs/lgpl/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/lgpl/Makefile.in	2004-06-18 15:19:17.685307640 -0400
+++ gnome-desktop-2.6.2/desktop-docs/lgpl/Makefile.in	2004-06-18 15:19:18.173233464 -0400
@@ -149,7 +149,7 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 
-SUBDIRS = C eu
+SUBDIRS = C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
diff -ruN gnome-desktop-2.6.2.orig/desktop-docs/lgpl/eu/Makefile.in gnome-desktop-2.6.2/desktop-docs/lgpl/eu/Makefile.in
--- gnome-desktop-2.6.2.orig/desktop-docs/lgpl/eu/Makefile.in	2004-06-18 15:19:17.684307792 -0400
+++ gnome-desktop-2.6.2/desktop-docs/lgpl/eu/Makefile.in	2004-06-18 15:19:18.171233768 -0400
@@ -57,7 +57,6 @@
 # generally called from the makefiles for particular formats of documentation.
 #
 # Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
 # If it is impossible to configure with --localstatedir=/var, then
@@ -353,7 +352,6 @@
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -361,7 +359,6 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 clean-local-omf:
 	-for file in $(omffile); do \