Update gnome-core to 1.2.2.1. Changes from version 1.2.1 are mostly cosmetic

for the UI, and several new translations.

7 files changed, 276 insertions, 260 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index f15af732f67..b5d0c5a9d51 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2000/09/11 20:46:38 fredb Exp $
+# $NetBSD: Makefile,v 1.52 2000/10/18 00:06:24 jlam Exp $
 
-DISTNAME=		gnome-core-1.2.1
+DISTNAME=		gnome-core-1.2.2.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-core/}
 
@@ -12,41 +12,35 @@ DEPENDS+=		libghttp>=1.0.4:../../www/libghttp
 DEPENDS+=		libxml-*:../../textproc/libxml
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
 
-GNU_CONFIGURE=		YES
-USE_X11BASE=		YES
-USE_GMAKE=		YES
-USE_LIBTOOL=		YES
-USE_PERL5=		YES
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
-ESD_CONFIG=		${LOCALBASE}/bin/esd-config
-ESD_CFLAGS=		`${ESD_CONFIG} --cflags`
-ESD_LIBS=		`${ESD_CONFIG} --libs`
-
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
-CPPFLAGS=		-I${LOCALBASE}/include
-CONFIGURE_ENV+=		ESD_CFLAGS="${ESD_CFLAGS}" \
-			ESD_CONFIG="${ESD_CONFIG}" \
-			ESD_LIBS="${ESD_LIBS}" \
-			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
-			CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include	# libintl.h
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
+USE_PERL5=		# defined
 PERL_SCRIPTS=		help-browser/gnome-convert help-browser/gnome-download
 
 post-patch:
 	cd ${WRKSRC}; \
 	for FILE in ${PERL_SCRIPTS}; do \
-	  ${CP} $$FILE $${FILE}.orig; \
-	  ${SED} -e 's#/usr/bin/perl#${PERL5}#g' \
-	    <$${FILE}.orig >$$FILE; \
+		${CP} $$FILE $${FILE}.orig; \
+		${SED} -e 's#/usr/bin/perl#${PERL5}#g' \
+			<$${FILE}.orig >$$FILE; \
 	done
 
 post-install:
-	for lang in C da es it no; do \
-		${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/$${lang}/figures; \
-	done
+	${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/C/figures
+	${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/da/figures
+	${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/es/figures
+	${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/it/figures
+	${RMDIR} ${PREFIX}/share/gnome/help/gnome-terminal/no/figures
 	${RMDIR} ${PREFIX}/share/gnome/help/session/C/figures
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/files/md5 b/x11/gnome-core/files/md5
index 59c2cb005c7..c7398a710fc 100644
--- a/x11/gnome-core/files/md5
+++ b/x11/gnome-core/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 2000/06/25 17:22:53 rh Exp $
+$NetBSD: md5,v 1.14 2000/10/18 00:06:26 jlam Exp $
 
-MD5 (gnome-core-1.2.1.tar.gz) = d8ac9408991bad4f2177c9a426b3c33b
+MD5 (gnome-core-1.2.2.1.tar.gz) = 57ac7c0e08fd906382d20221e4111cc7
diff --git a/x11/gnome-core/files/patch-sum b/x11/gnome-core/files/patch-sum
index af6962bb7fe..87894120cd5 100644
--- a/x11/gnome-core/files/patch-sum
+++ b/x11/gnome-core/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.16 2000/06/21 00:47:45 jlam Exp $
+$NetBSD: patch-sum,v 1.17 2000/10/18 00:06:26 jlam Exp $
 
-MD5 (patch-aa) = ff1a7cf7dfccd5cb1bb09dc4cce0b9ed
-MD5 (patch-af) = 330b90aecd9329b974d6db8f1b6c2aed
+MD5 (patch-aa) = 0212bb34df5c1458d2040701f0676db7
+MD5 (patch-ab) = d3502ab67db8dae7cf76e49d4528f7e2
 MD5 (patch-ag) = 3310214d715de1ca1366a0272ad64ae6
diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa
index 1eaf6cc270a..9c9fa13d42b 100644
--- a/x11/gnome-core/patches/patch-aa
+++ b/x11/gnome-core/patches/patch-aa
@@ -1,14 +1,16 @@
-$NetBSD: patch-aa,v 1.8 2000/06/21 00:47:45 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2000/10/18 00:06:27 jlam Exp $
 
---- configure.orig	Tue May 23 01:35:01 2000
-+++ configure	Tue Jun 20 20:06:14 2000
-@@ -6586,6 +6586,9 @@
- s%@CATALOGS@%$CATALOGS%g
- s%@CATOBJEXT@%$CATOBJEXT%g
- s%@DATADIRNAME@%$DATADIRNAME%g
-+s%@ESD_CFLAGS@%$ESD_CFLAGS%g
-+s%@ESD_CONFIG@%$ESD_CONFIG%g
-+s%@ESD_LIBS@%$ESD_LIBS%g
- s%@GMOFILES@%$GMOFILES%g
- s%@INSTOBJEXT@%$INSTOBJEXT%g
- s%@INTLDEPS@%$INTLDEPS%g
+--- configure.orig	Tue Sep 26 11:51:54 2000
++++ configure
+@@ -5244,6 +5244,11 @@
+    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
++
+ # AM_GNOME_GETTEXT above substs $DATADIRNAME
+ # this is the directory where the *.{mo,gmo} files are installed
+ gnomelocaledir='${prefix}/share/locale'
diff --git a/x11/gnome-core/patches/patch-ab b/x11/gnome-core/patches/patch-ab
new file mode 100644
index 00000000000..84a0b4edf12
--- /dev/null
+++ b/x11/gnome-core/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.5 2000/10/18 00:06:27 jlam Exp $
+
+--- applet-docs.make.orig	Thu Apr 20 03:25:57 2000
++++ applet-docs.make
+@@ -10,6 +10,7 @@
+ # include $(top_srcdir)/applet-docs.make
+ 
+ docdir = $(datadir)/gnome/help/$(applet)_applet/$(lang)
++helpdir = $(docdir)
+ doc_DATA =	\
+ 	index.html	\
+ 	topic.dat	\
diff --git a/x11/gnome-core/patches/patch-af b/x11/gnome-core/patches/patch-af
deleted file mode 100644
index d3ee8d67264..00000000000
--- a/x11/gnome-core/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/06/21 00:47:45 jlam Exp $
-
---- po/Makefile.in.in.orig	Tue May 23 01:34:39 2000
-+++ po/Makefile.in.in	Tue Jun 20 20:06:53 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index 421db0a94e5..fa29cf7f18f 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2000/08/28 23:04:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2000/10/18 00:06:27 jlam Exp $
 bin/deskguide_applet
 bin/gmenu
 bin/gnome-about
@@ -65,22 +65,23 @@ share/applets/Utility/printer.desktop
 share/applets/Utility/tasklist_applet.desktop
 share/control-center/Desktop/gnome-panel-properties.desktop
 share/control-center/Session/gnome-hint-properties.desktop
+share/gnome-about/contributors.dat
 share/gnome/apps/.directory
 share/gnome/apps/.order
 share/gnome/apps/Applications/.directory
 share/gnome/apps/Applications/Emacs.desktop
 share/gnome/apps/Applications/Vim.desktop
 share/gnome/apps/Applications/WordPerfect.desktop
-share/gnome/apps/Applications/Xemacs.desktop
 share/gnome/apps/Applications/XEphem.desktop
+share/gnome/apps/Applications/Xemacs.desktop
 share/gnome/apps/Applications/gaspell.desktop
 share/gnome/apps/Development/.directory
 share/gnome/apps/Games/.directory
 share/gnome/apps/Gmc.desktop
 share/gnome/apps/Graphics/.directory
 share/gnome/apps/Graphics/GIMP.desktop
-share/gnome/apps/Graphics/xv.desktop
 share/gnome/apps/Graphics/xbmbrowser.desktop
+share/gnome/apps/Graphics/xv.desktop
 share/gnome/apps/Internet/.directory
 share/gnome/apps/Internet/Netscape.desktop
 share/gnome/apps/Internet/TkSETI.desktop
@@ -89,17 +90,17 @@ share/gnome/apps/Internet/lynx.desktop
 share/gnome/apps/Multimedia/.directory
 share/gnome/apps/Settings/.directory
 share/gnome/apps/Settings/.order
-share/gnome/apps/Settings/Imlib_config.desktop
-share/gnome/apps/Settings/gmenu.desktop
 share/gnome/apps/Settings/Desktop/gnome-panel-properties.desktop
+share/gnome/apps/Settings/Imlib_config.desktop
+share/gnome/apps/Settings/Session/gnome-hint-properties.desktop
 share/gnome/apps/Settings/Session/save-session.desktop
 share/gnome/apps/Settings/Session/session.desktop
-share/gnome/apps/Settings/Session/gnome-hint-properties.desktop
+share/gnome/apps/Settings/gmenu.desktop
 share/gnome/apps/System/.directory
-share/gnome/apps/System/UNIX.desktop
-share/gnome/apps/System/UNIX-regular.desktop
 share/gnome/apps/System/Eterm.desktop
 share/gnome/apps/System/Kterm.desktop
+share/gnome/apps/System/UNIX-regular.desktop
+share/gnome/apps/System/UNIX.desktop
 share/gnome/apps/System/Vnterm.desktop
 share/gnome/apps/System/gnome-terminal.desktop
 share/gnome/apps/Utilities/.directory
@@ -107,98 +108,107 @@ share/gnome/apps/Utilities/gnome-hint.desktop
 share/gnome/apps/gnome-help.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/help/clock_applet/C/clock_applet.png
+share/gnome/help/clock_applet/C/clock_settings.png
+share/gnome/help/clock_applet/C/docbook.css
+share/gnome/help/clock_applet/C/index.html
+share/gnome/help/clock_applet/C/ln7.html
 share/gnome/help/clock_applet/C/stylesheet-images/caution.png
 share/gnome/help/clock_applet/C/stylesheet-images/important.png
 share/gnome/help/clock_applet/C/stylesheet-images/note.png
 share/gnome/help/clock_applet/C/stylesheet-images/tip.png
 share/gnome/help/clock_applet/C/stylesheet-images/warning.png
-share/gnome/help/clock_applet/C/index.html
-share/gnome/help/clock_applet/C/ln7.html
-share/gnome/help/clock_applet/C/docbook.css
-share/gnome/help/clock_applet/C/clock_applet.png
-share/gnome/help/clock_applet/C/clock_settings.png
+share/gnome/help/clock_applet/C/topic.dat
+share/gnome/help/clock_applet/da/clock_applet.png
+share/gnome/help/clock_applet/da/clock_settings.png
+share/gnome/help/clock_applet/da/docbook.css
+share/gnome/help/clock_applet/da/index.html
+share/gnome/help/clock_applet/da/ln10.html
 share/gnome/help/clock_applet/da/stylesheet-images/caution.png
 share/gnome/help/clock_applet/da/stylesheet-images/important.png
 share/gnome/help/clock_applet/da/stylesheet-images/note.png
 share/gnome/help/clock_applet/da/stylesheet-images/tip.png
 share/gnome/help/clock_applet/da/stylesheet-images/warning.png
-share/gnome/help/clock_applet/da/index.html
-share/gnome/help/clock_applet/da/ln10.html
-share/gnome/help/clock_applet/da/docbook.css
-share/gnome/help/clock_applet/da/clock_applet.png
-share/gnome/help/clock_applet/da/clock_settings.png
-share/gnome/help/desk-guide_applet/C/stylesheet-images/caution.png
-share/gnome/help/desk-guide_applet/C/stylesheet-images/important.png
-share/gnome/help/desk-guide_applet/C/stylesheet-images/note.png
-share/gnome/help/desk-guide_applet/C/stylesheet-images/tip.png
-share/gnome/help/desk-guide_applet/C/stylesheet-images/warning.png
-share/gnome/help/desk-guide_applet/C/index.html
-share/gnome/help/desk-guide_applet/C/ln7.html
-share/gnome/help/desk-guide_applet/C/docbook.css
+share/gnome/help/clock_applet/da/topic.dat
 share/gnome/help/desk-guide_applet/C/deskguide-fig.png
 share/gnome/help/desk-guide_applet/C/deskguide-properties-advanced-fig.png
 share/gnome/help/desk-guide_applet/C/deskguide-properties-geometry-fig.png
 share/gnome/help/desk-guide_applet/C/deskguide-properties-tasks-fig.png
 share/gnome/help/desk-guide_applet/C/deskguide-properties.png
 share/gnome/help/desk-guide_applet/C/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/de/stylesheet-images/caution.png
-share/gnome/help/desk-guide_applet/de/stylesheet-images/important.png
-share/gnome/help/desk-guide_applet/de/stylesheet-images/note.png
-share/gnome/help/desk-guide_applet/de/stylesheet-images/tip.png
-share/gnome/help/desk-guide_applet/de/stylesheet-images/warning.png
-share/gnome/help/desk-guide_applet/de/index.html
-share/gnome/help/desk-guide_applet/de/ln11.html
-share/gnome/help/desk-guide_applet/de/docbook.css
+share/gnome/help/desk-guide_applet/C/docbook.css
+share/gnome/help/desk-guide_applet/C/index.html
+share/gnome/help/desk-guide_applet/C/ln7.html
+share/gnome/help/desk-guide_applet/C/stylesheet-images/caution.png
+share/gnome/help/desk-guide_applet/C/stylesheet-images/important.png
+share/gnome/help/desk-guide_applet/C/stylesheet-images/note.png
+share/gnome/help/desk-guide_applet/C/stylesheet-images/tip.png
+share/gnome/help/desk-guide_applet/C/stylesheet-images/warning.png
+share/gnome/help/desk-guide_applet/C/topic.dat
 share/gnome/help/desk-guide_applet/de/deskguide-fig.png
 share/gnome/help/desk-guide_applet/de/deskguide-properties-advanced-fig.png
 share/gnome/help/desk-guide_applet/de/deskguide-properties-geometry-fig.png
 share/gnome/help/desk-guide_applet/de/deskguide-properties-tasks-fig.png
 share/gnome/help/desk-guide_applet/de/deskguide-properties.png
 share/gnome/help/desk-guide_applet/de/deskguide-tasklist-fig.png
+share/gnome/help/desk-guide_applet/de/docbook.css
+share/gnome/help/desk-guide_applet/de/index.html
+share/gnome/help/desk-guide_applet/de/ln11.html
+share/gnome/help/desk-guide_applet/de/stylesheet-images/caution.png
+share/gnome/help/desk-guide_applet/de/stylesheet-images/important.png
+share/gnome/help/desk-guide_applet/de/stylesheet-images/note.png
+share/gnome/help/desk-guide_applet/de/stylesheet-images/tip.png
+share/gnome/help/desk-guide_applet/de/stylesheet-images/warning.png
+share/gnome/help/desk-guide_applet/de/topic.dat
+share/gnome/help/fish_applet/C/docbook.css
+share/gnome/help/fish_applet/C/fish_applet.png
+share/gnome/help/fish_applet/C/fish_settings.png
+share/gnome/help/fish_applet/C/index.html
+share/gnome/help/fish_applet/C/ln7.html
 share/gnome/help/fish_applet/C/stylesheet-images/caution.png
 share/gnome/help/fish_applet/C/stylesheet-images/important.png
 share/gnome/help/fish_applet/C/stylesheet-images/note.png
 share/gnome/help/fish_applet/C/stylesheet-images/tip.png
 share/gnome/help/fish_applet/C/stylesheet-images/warning.png
-share/gnome/help/fish_applet/C/index.html
-share/gnome/help/fish_applet/C/ln7.html
-share/gnome/help/fish_applet/C/docbook.css
-share/gnome/help/fish_applet/C/fish_applet.png
-share/gnome/help/fish_applet/C/fish_settings.png
-share/gnome/help/fish_applet/no/stylesheet-images/caution.png
-share/gnome/help/fish_applet/no/stylesheet-images/important.png
-share/gnome/help/fish_applet/no/stylesheet-images/note.png
-share/gnome/help/fish_applet/no/stylesheet-images/tip.png
-share/gnome/help/fish_applet/no/stylesheet-images/warning.png
-share/gnome/help/fish_applet/no/index.html
-share/gnome/help/fish_applet/no/ln7.html
-share/gnome/help/fish_applet/no/docbook.css
+share/gnome/help/fish_applet/C/topic.dat
+share/gnome/help/fish_applet/da/docbook.css
+share/gnome/help/fish_applet/da/fish_applet.png
+share/gnome/help/fish_applet/da/fish_settings.png
+share/gnome/help/fish_applet/da/index.html
+share/gnome/help/fish_applet/da/ln10.html
 share/gnome/help/fish_applet/da/stylesheet-images/caution.png
 share/gnome/help/fish_applet/da/stylesheet-images/important.png
 share/gnome/help/fish_applet/da/stylesheet-images/note.png
 share/gnome/help/fish_applet/da/stylesheet-images/tip.png
 share/gnome/help/fish_applet/da/stylesheet-images/warning.png
-share/gnome/help/fish_applet/da/index.html
-share/gnome/help/fish_applet/da/ln10.html
-share/gnome/help/fish_applet/da/docbook.css
-share/gnome/help/fish_applet/da/fish_applet.png
-share/gnome/help/fish_applet/da/fish_settings.png
+share/gnome/help/fish_applet/da/topic.dat
+share/gnome/help/fish_applet/no/docbook.css
+share/gnome/help/fish_applet/no/index.html
+share/gnome/help/fish_applet/no/ln7.html
+share/gnome/help/fish_applet/no/stylesheet-images/caution.png
+share/gnome/help/fish_applet/no/stylesheet-images/important.png
+share/gnome/help/fish_applet/no/stylesheet-images/note.png
+share/gnome/help/fish_applet/no/stylesheet-images/tip.png
+share/gnome/help/fish_applet/no/stylesheet-images/warning.png
+share/gnome/help/fish_applet/no/topic.dat
+share/gnome/help/gen_util_applet/de/docbook.css
+share/gnome/help/gen_util_applet/de/index.html
+share/gnome/help/gen_util_applet/de/ln7.html
 share/gnome/help/gen_util_applet/de/stylesheet-images/caution.png
 share/gnome/help/gen_util_applet/de/stylesheet-images/important.png
 share/gnome/help/gen_util_applet/de/stylesheet-images/note.png
 share/gnome/help/gen_util_applet/de/stylesheet-images/tip.png
 share/gnome/help/gen_util_applet/de/stylesheet-images/warning.png
-share/gnome/help/gen_util_applet/de/index.html
-share/gnome/help/gen_util_applet/de/ln7.html
-share/gnome/help/gen_util_applet/de/docbook.css
+share/gnome/help/gen_util_applet/de/topic.dat
+share/gnome/help/gen_util_applet/no/docbook.css
+share/gnome/help/gen_util_applet/no/index.html
+share/gnome/help/gen_util_applet/no/ln7.html
 share/gnome/help/gen_util_applet/no/stylesheet-images/caution.png
 share/gnome/help/gen_util_applet/no/stylesheet-images/important.png
 share/gnome/help/gen_util_applet/no/stylesheet-images/note.png
 share/gnome/help/gen_util_applet/no/stylesheet-images/tip.png
 share/gnome/help/gen_util_applet/no/stylesheet-images/warning.png
-share/gnome/help/gen_util_applet/no/index.html
-share/gnome/help/gen_util_applet/no/ln7.html
-share/gnome/help/gen_util_applet/no/docbook.css
+share/gnome/help/gen_util_applet/no/topic.dat
 share/gnome/help/gnome-terminal/C/authors.html
 share/gnome/help/gnome-terminal/C/classes.html
 share/gnome/help/gnome-terminal/C/config.html
@@ -206,36 +216,36 @@ share/gnome/help/gnome-terminal/C/docbook.css
 share/gnome/help/gnome-terminal/C/environment.html
 share/gnome/help/gnome-terminal/C/index.html
 share/gnome/help/gnome-terminal/C/license.html
-share/gnome/help/gnome-terminal/C/ln11.html
+share/gnome/help/gnome-terminal/C/ln7.html
 share/gnome/help/gnome-terminal/C/menus.html
 share/gnome/help/gnome-terminal/C/options.html
 share/gnome/help/gnome-terminal/C/pointerusage.html
-share/gnome/help/gnome-terminal/C/topic.dat
-share/gnome/help/gnome-terminal/C/usage.html
 share/gnome/help/gnome-terminal/C/stylesheet-images/caution.png
 share/gnome/help/gnome-terminal/C/stylesheet-images/important.png
 share/gnome/help/gnome-terminal/C/stylesheet-images/note.png
 share/gnome/help/gnome-terminal/C/stylesheet-images/tip.png
 share/gnome/help/gnome-terminal/C/stylesheet-images/warning.png
-share/gnome/help/gnome-terminal/da/index.html
-share/gnome/help/gnome-terminal/da/topic.dat
+share/gnome/help/gnome-terminal/C/topic.dat
+share/gnome/help/gnome-terminal/C/usage.html
 share/gnome/help/gnome-terminal/da/authors.html
 share/gnome/help/gnome-terminal/da/classes.html
 share/gnome/help/gnome-terminal/da/config.html
+share/gnome/help/gnome-terminal/da/docbook.css
 share/gnome/help/gnome-terminal/da/emulation.html
 share/gnome/help/gnome-terminal/da/enviroment.html
+share/gnome/help/gnome-terminal/da/index.html
 share/gnome/help/gnome-terminal/da/ln9.html
 share/gnome/help/gnome-terminal/da/menus.html
 share/gnome/help/gnome-terminal/da/options.html
 share/gnome/help/gnome-terminal/da/pointerusage.html
-share/gnome/help/gnome-terminal/da/terminal.html
-share/gnome/help/gnome-terminal/da/termtech.html
-share/gnome/help/gnome-terminal/da/docbook.css
 share/gnome/help/gnome-terminal/da/stylesheet-images/caution.png
 share/gnome/help/gnome-terminal/da/stylesheet-images/important.png
 share/gnome/help/gnome-terminal/da/stylesheet-images/note.png
 share/gnome/help/gnome-terminal/da/stylesheet-images/tip.png
 share/gnome/help/gnome-terminal/da/stylesheet-images/warning.png
+share/gnome/help/gnome-terminal/da/terminal.html
+share/gnome/help/gnome-terminal/da/termtech.html
+share/gnome/help/gnome-terminal/da/topic.dat
 share/gnome/help/gnome-terminal/de/authors.html
 share/gnome/help/gnome-terminal/de/classes.html
 share/gnome/help/gnome-terminal/de/config.html
@@ -248,23 +258,23 @@ share/gnome/help/gnome-terminal/de/options.html
 share/gnome/help/gnome-terminal/de/pointerusage.html
 share/gnome/help/gnome-terminal/de/topic.dat
 share/gnome/help/gnome-terminal/de/usage.html
-share/gnome/help/gnome-terminal/es/index.html
-share/gnome/help/gnome-terminal/es/ln17.html
-share/gnome/help/gnome-terminal/es/topic.dat
-share/gnome/help/gnome-terminal/es/usage.html
 share/gnome/help/gnome-terminal/es/authors.html
 share/gnome/help/gnome-terminal/es/classes.html
 share/gnome/help/gnome-terminal/es/config.html
+share/gnome/help/gnome-terminal/es/docbook.css
 share/gnome/help/gnome-terminal/es/environment.html
+share/gnome/help/gnome-terminal/es/index.html
+share/gnome/help/gnome-terminal/es/ln17.html
 share/gnome/help/gnome-terminal/es/menus.html
 share/gnome/help/gnome-terminal/es/options.html
 share/gnome/help/gnome-terminal/es/pointerusage.html
-share/gnome/help/gnome-terminal/es/docbook.css
 share/gnome/help/gnome-terminal/es/stylesheet-images/caution.png
 share/gnome/help/gnome-terminal/es/stylesheet-images/important.png
 share/gnome/help/gnome-terminal/es/stylesheet-images/note.png
 share/gnome/help/gnome-terminal/es/stylesheet-images/tip.png
 share/gnome/help/gnome-terminal/es/stylesheet-images/warning.png
+share/gnome/help/gnome-terminal/es/topic.dat
+share/gnome/help/gnome-terminal/es/usage.html
 share/gnome/help/gnome-terminal/it/authors.html
 share/gnome/help/gnome-terminal/it/classes.html
 share/gnome/help/gnome-terminal/it/config.html
@@ -276,13 +286,13 @@ share/gnome/help/gnome-terminal/it/ln12.html
 share/gnome/help/gnome-terminal/it/menus.html
 share/gnome/help/gnome-terminal/it/options.html
 share/gnome/help/gnome-terminal/it/pointerusage.html
-share/gnome/help/gnome-terminal/it/terminal.html
-share/gnome/help/gnome-terminal/it/topic.dat
 share/gnome/help/gnome-terminal/it/stylesheet-images/caution.png
 share/gnome/help/gnome-terminal/it/stylesheet-images/important.png
 share/gnome/help/gnome-terminal/it/stylesheet-images/note.png
 share/gnome/help/gnome-terminal/it/stylesheet-images/tip.png
 share/gnome/help/gnome-terminal/it/stylesheet-images/warning.png
+share/gnome/help/gnome-terminal/it/terminal.html
+share/gnome/help/gnome-terminal/it/topic.dat
 share/gnome/help/gnome-terminal/no/authors.html
 share/gnome/help/gnome-terminal/no/classes.html
 share/gnome/help/gnome-terminal/no/config.html
@@ -294,24 +304,24 @@ share/gnome/help/gnome-terminal/no/ln9.html
 share/gnome/help/gnome-terminal/no/menus.html
 share/gnome/help/gnome-terminal/no/options.html
 share/gnome/help/gnome-terminal/no/pointerusage.html
-share/gnome/help/gnome-terminal/no/terminal.html
-share/gnome/help/gnome-terminal/no/termtech.html
-share/gnome/help/gnome-terminal/no/topic.dat
 share/gnome/help/gnome-terminal/no/stylesheet-images/caution.png
 share/gnome/help/gnome-terminal/no/stylesheet-images/important.png
 share/gnome/help/gnome-terminal/no/stylesheet-images/note.png
 share/gnome/help/gnome-terminal/no/stylesheet-images/tip.png
 share/gnome/help/gnome-terminal/no/stylesheet-images/warning.png
+share/gnome/help/gnome-terminal/no/terminal.html
+share/gnome/help/gnome-terminal/no/termtech.html
+share/gnome/help/gnome-terminal/no/topic.dat
 share/gnome/help/help-browser/C/default-page.html
 share/gnome/help/help-browser/C/gnome-logo-large.png
 share/gnome/help/help-browser/C/help-browser.html
 share/gnome/help/help-browser/C/index.html
 share/gnome/help/help-browser/C/topic.dat
 share/gnome/help/help-browser/ca/default-page.html
-share/gnome/help/help-browser/da/help-browser.html
-share/gnome/help/help-browser/da/topic.dat
 share/gnome/help/help-browser/da/default-page.html
+share/gnome/help/help-browser/da/help-browser.html
 share/gnome/help/help-browser/da/index.html
+share/gnome/help/help-browser/da/topic.dat
 share/gnome/help/help-browser/el/default-page.html
 share/gnome/help/help-browser/es/default-page.html
 share/gnome/help/help-browser/es/help-browser.html
@@ -359,31 +369,33 @@ share/gnome/help/help-browser/wa/default-page.html
 share/gnome/help/help-browser/wa/help-browser.html
 share/gnome/help/help-browser/wa/index.html
 share/gnome/help/help-browser/wa/topic.dat
-share/gnome/help/mailcheck_applet/C/stylesheet-images/warning.png
+share/gnome/help/mailcheck_applet/C/docbook.css
 share/gnome/help/mailcheck_applet/C/index.html
 share/gnome/help/mailcheck_applet/C/ln7.html
-share/gnome/help/mailcheck_applet/C/docbook.css
 share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailbox.png
 share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck_applet/C/stylesheet-images/caution.png
 share/gnome/help/mailcheck_applet/C/stylesheet-images/important.png
 share/gnome/help/mailcheck_applet/C/stylesheet-images/note.png
 share/gnome/help/mailcheck_applet/C/stylesheet-images/tip.png
+share/gnome/help/mailcheck_applet/C/stylesheet-images/warning.png
+share/gnome/help/mailcheck_applet/C/topic.dat
+share/gnome/help/mailcheck_applet/da/docbook.css
+share/gnome/help/mailcheck_applet/da/index.html
+share/gnome/help/mailcheck_applet/da/ln7.html
+share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck_applet/da/stylesheet-images/caution.png
 share/gnome/help/mailcheck_applet/da/stylesheet-images/important.png
 share/gnome/help/mailcheck_applet/da/stylesheet-images/note.png
 share/gnome/help/mailcheck_applet/da/stylesheet-images/tip.png
 share/gnome/help/mailcheck_applet/da/stylesheet-images/warning.png
-share/gnome/help/mailcheck_applet/da/index.html
-share/gnome/help/mailcheck_applet/da/ln7.html
-share/gnome/help/mailcheck_applet/da/docbook.css
-share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailcheck.png
-share/gnome/help/panel/C/stylesheet-images/caution.png
-share/gnome/help/panel/C/stylesheet-images/important.png
-share/gnome/help/panel/C/stylesheet-images/note.png
-share/gnome/help/panel/C/stylesheet-images/tip.png
-share/gnome/help/panel/C/stylesheet-images/warning.png
+share/gnome/help/mailcheck_applet/da/topic.dat
+share/gnome/help/panel/C/appletadd.html
+share/gnome/help/panel/C/applets.html
+share/gnome/help/panel/C/authors.html
+share/gnome/help/panel/C/docbook.css
+share/gnome/help/panel/C/drawers.html
 share/gnome/help/panel/C/figures/create_launcher.png
 share/gnome/help/panel/C/figures/drawer_open.png
 share/gnome/help/panel/C/figures/drawer_properties.png
@@ -408,11 +420,6 @@ share/gnome/help/panel/C/figures/panel_runbutton.png
 share/gnome/help/panel/C/figures/panel_runprogram.png
 share/gnome/help/panel/C/figures/panel_swallow.png
 share/gnome/help/panel/C/figures/status_dock.png
-share/gnome/help/panel/C/topic.dat
-share/gnome/help/panel/C/appletadd.html
-share/gnome/help/panel/C/applets.html
-share/gnome/help/panel/C/authors.html
-share/gnome/help/panel/C/drawers.html
 share/gnome/help/panel/C/globalpanelprefs.html
 share/gnome/help/panel/C/index.html
 share/gnome/help/panel/C/launchers.html
@@ -425,12 +432,17 @@ share/gnome/help/panel/C/panelbugs.html
 share/gnome/help/panel/C/panelmove.html
 share/gnome/help/panel/C/panelproperties.html
 share/gnome/help/panel/C/specialobjects.html
-share/gnome/help/panel/C/docbook.css
-share/gnome/help/panel/de/stylesheet-images/caution.png
-share/gnome/help/panel/de/stylesheet-images/important.png
-share/gnome/help/panel/de/stylesheet-images/note.png
-share/gnome/help/panel/de/stylesheet-images/tip.png
-share/gnome/help/panel/de/stylesheet-images/warning.png
+share/gnome/help/panel/C/stylesheet-images/caution.png
+share/gnome/help/panel/C/stylesheet-images/important.png
+share/gnome/help/panel/C/stylesheet-images/note.png
+share/gnome/help/panel/C/stylesheet-images/tip.png
+share/gnome/help/panel/C/stylesheet-images/warning.png
+share/gnome/help/panel/C/topic.dat
+share/gnome/help/panel/de/appletadd.html
+share/gnome/help/panel/de/applets.html
+share/gnome/help/panel/de/authors.html
+share/gnome/help/panel/de/docbook.css
+share/gnome/help/panel/de/drawers.html
 share/gnome/help/panel/de/figures/create_launcher.png
 share/gnome/help/panel/de/figures/drawer_open.png
 share/gnome/help/panel/de/figures/drawer_properties.png
@@ -453,11 +465,6 @@ share/gnome/help/panel/de/figures/panel_props_back.png
 share/gnome/help/panel/de/figures/panel_props_edge.png
 share/gnome/help/panel/de/figures/panel_swallow.png
 share/gnome/help/panel/de/figures/status_dock.png
-share/gnome/help/panel/de/topic.dat
-share/gnome/help/panel/de/appletadd.html
-share/gnome/help/panel/de/applets.html
-share/gnome/help/panel/de/authors.html
-share/gnome/help/panel/de/drawers.html
 share/gnome/help/panel/de/globalpanelprefs.html
 share/gnome/help/panel/de/index.html
 share/gnome/help/panel/de/launchers.html
@@ -469,12 +476,17 @@ share/gnome/help/panel/de/panelbugs.html
 share/gnome/help/panel/de/panelmove.html
 share/gnome/help/panel/de/panelproperties.html
 share/gnome/help/panel/de/specialobjects.html
-share/gnome/help/panel/de/docbook.css
-share/gnome/help/panel/it/stylesheet-images/caution.png
-share/gnome/help/panel/it/stylesheet-images/important.png
-share/gnome/help/panel/it/stylesheet-images/note.png
-share/gnome/help/panel/it/stylesheet-images/tip.png
-share/gnome/help/panel/it/stylesheet-images/warning.png
+share/gnome/help/panel/de/stylesheet-images/caution.png
+share/gnome/help/panel/de/stylesheet-images/important.png
+share/gnome/help/panel/de/stylesheet-images/note.png
+share/gnome/help/panel/de/stylesheet-images/tip.png
+share/gnome/help/panel/de/stylesheet-images/warning.png
+share/gnome/help/panel/de/topic.dat
+share/gnome/help/panel/it/appletadd.html
+share/gnome/help/panel/it/applets.html
+share/gnome/help/panel/it/authors.html
+share/gnome/help/panel/it/docbook.css
+share/gnome/help/panel/it/drawers.html
 share/gnome/help/panel/it/figures/create_launcher.png
 share/gnome/help/panel/it/figures/drawer_open.png
 share/gnome/help/panel/it/figures/drawer_properties.png
@@ -498,11 +510,6 @@ share/gnome/help/panel/it/figures/panel_runbutton.png
 share/gnome/help/panel/it/figures/panel_runprogram.png
 share/gnome/help/panel/it/figures/panel_swallow.png
 share/gnome/help/panel/it/figures/status_dock.png
-share/gnome/help/panel/it/topic.dat
-share/gnome/help/panel/it/appletadd.html
-share/gnome/help/panel/it/applets.html
-share/gnome/help/panel/it/authors.html
-share/gnome/help/panel/it/drawers.html
 share/gnome/help/panel/it/globalpanelprefs.html
 share/gnome/help/panel/it/index.html
 share/gnome/help/panel/it/launchers.html
@@ -514,39 +521,41 @@ share/gnome/help/panel/it/panelbugs.html
 share/gnome/help/panel/it/panelmove.html
 share/gnome/help/panel/it/panelproperties.html
 share/gnome/help/panel/it/specialobjects.html
-share/gnome/help/panel/it/docbook.css
+share/gnome/help/panel/it/stylesheet-images/caution.png
+share/gnome/help/panel/it/stylesheet-images/important.png
+share/gnome/help/panel/it/stylesheet-images/note.png
+share/gnome/help/panel/it/stylesheet-images/tip.png
+share/gnome/help/panel/it/stylesheet-images/warning.png
+share/gnome/help/panel/it/topic.dat
+share/gnome/help/printer_applet/C/docbook.css
+share/gnome/help/printer_applet/C/index.html
+share/gnome/help/printer_applet/C/ln7.html
+share/gnome/help/printer_applet/C/printer-fig.png
+share/gnome/help/printer_applet/C/printer-properties.png
 share/gnome/help/printer_applet/C/stylesheet-images/caution.png
 share/gnome/help/printer_applet/C/stylesheet-images/important.png
 share/gnome/help/printer_applet/C/stylesheet-images/note.png
 share/gnome/help/printer_applet/C/stylesheet-images/tip.png
 share/gnome/help/printer_applet/C/stylesheet-images/warning.png
-share/gnome/help/printer_applet/C/index.html
-share/gnome/help/printer_applet/C/ln7.html
-share/gnome/help/printer_applet/C/docbook.css
-share/gnome/help/printer_applet/C/printer-fig.png
-share/gnome/help/printer_applet/C/printer-properties.png
+share/gnome/help/printer_applet/C/topic.dat
+share/gnome/help/printer_applet/da/docbook.css
+share/gnome/help/printer_applet/da/index.html
+share/gnome/help/printer_applet/da/ln10.html
+share/gnome/help/printer_applet/da/printer-fig.png
+share/gnome/help/printer_applet/da/printer-properties.png
 share/gnome/help/printer_applet/da/stylesheet-images/caution.png
 share/gnome/help/printer_applet/da/stylesheet-images/important.png
 share/gnome/help/printer_applet/da/stylesheet-images/note.png
 share/gnome/help/printer_applet/da/stylesheet-images/tip.png
 share/gnome/help/printer_applet/da/stylesheet-images/warning.png
-share/gnome/help/printer_applet/da/index.html
-share/gnome/help/printer_applet/da/ln10.html
-share/gnome/help/printer_applet/da/docbook.css
-share/gnome/help/printer_applet/da/printer-fig.png
-share/gnome/help/printer_applet/da/printer-properties.png
-share/gnome/help/session/C/stylesheet-images/caution.png
-share/gnome/help/session/C/stylesheet-images/important.png
-share/gnome/help/session/C/stylesheet-images/note.png
-share/gnome/help/session/C/stylesheet-images/tip.png
-share/gnome/help/session/C/stylesheet-images/warning.png
+share/gnome/help/printer_applet/da/topic.dat
 share/gnome/help/session/C/authors.html
 share/gnome/help/session/C/bugs.html
+share/gnome/help/session/C/button_remove.png
+share/gnome/help/session/C/docbook.css
 share/gnome/help/session/C/index.html
 share/gnome/help/session/C/license.html
 share/gnome/help/session/C/ln7.html
-share/gnome/help/session/C/docbook.css
-share/gnome/help/session/C/button_remove.png
 share/gnome/help/session/C/session-properties.png
 share/gnome/help/session/C/stock_exec.png
 share/gnome/help/session/C/stock_help.png
@@ -555,26 +564,32 @@ share/gnome/help/session/C/stock_refresh.png
 share/gnome/help/session/C/stock_save.png
 share/gnome/help/session/C/stock_timer.png
 share/gnome/help/session/C/stock_trash.png
+share/gnome/help/session/C/stylesheet-images/caution.png
+share/gnome/help/session/C/stylesheet-images/important.png
+share/gnome/help/session/C/stylesheet-images/note.png
+share/gnome/help/session/C/stylesheet-images/tip.png
+share/gnome/help/session/C/stylesheet-images/warning.png
+share/gnome/help/tasklist_applet/C/docbook.css
+share/gnome/help/tasklist_applet/C/index.html
+share/gnome/help/tasklist_applet/C/ln7.html
 share/gnome/help/tasklist_applet/C/stylesheet-images/caution.png
 share/gnome/help/tasklist_applet/C/stylesheet-images/important.png
 share/gnome/help/tasklist_applet/C/stylesheet-images/note.png
 share/gnome/help/tasklist_applet/C/stylesheet-images/tip.png
 share/gnome/help/tasklist_applet/C/stylesheet-images/warning.png
-share/gnome/help/tasklist_applet/C/index.html
-share/gnome/help/tasklist_applet/C/ln7.html
-share/gnome/help/tasklist_applet/C/docbook.css
 share/gnome/help/tasklist_applet/C/tasklist-fig.png
 share/gnome/help/tasklist_applet/C/tasklist-properties-size.png
 share/gnome/help/tasklist_applet/C/tasklist-properties.png
 share/gnome/help/tasklist_applet/C/tasklist-rightclick-fig.png
+share/gnome/help/tasklist_applet/C/topic.dat
 share/gnome/hints/panel.hints
-share/gnome/html/panel.sgml
-share/gnome/html/panel.html
+share/gnome/html/panel-decl.txt
+share/gnome/html/panel-sections.txt
 share/gnome/html/panel.hierarchy
+share/gnome/html/panel.html
+share/gnome/html/panel.sgml
 share/gnome/html/panel.signals
 share/gnome/html/panel.types
-share/gnome/html/panel-decl.txt
-share/gnome/html/panel-sections.txt
 share/gnome/html/panel/appletwidget.html
 share/gnome/html/panel/book1.html
 share/gnome/html/panel/c26.html
@@ -595,7 +610,6 @@ share/gnome/html/panel/x49.html
 share/gnome/html/panel/x57.html
 share/gnome/html/panel/x76.html
 share/gnome/html/panel/x95.html
-share/gnome-about/contributors.dat
 share/idl/Terminal.idl
 share/idl/gnome-panel.idl
 share/idl/help-browser.idl
@@ -625,6 +639,9 @@ share/locale/pt/LC_MESSAGES/gnome-core.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-core.mo
 share/locale/ru/LC_MESSAGES/gnome-core.mo
 share/locale/sk/LC_MESSAGES/gnome-core.mo
+share/locale/sl/LC_MESSAGES/gnome-core.mo
+share/locale/sp/LC_MESSAGES/gnome-core.mo
+share/locale/sr/LC_MESSAGES/gnome-core.mo
 share/locale/sv/LC_MESSAGES/gnome-core.mo
 share/locale/tr/LC_MESSAGES/gnome-core.mo
 share/locale/uk/LC_MESSAGES/gnome-core.mo
@@ -633,12 +650,12 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
 share/mc/templates/GIMP.desktop
 share/panelrc
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
 share/pixmaps/fish/fishanim.png
 share/pixmaps/fish/footguy.png
 share/pixmaps/fish/monkey.png
 share/pixmaps/fish/oldwanda.png
-share/pixmaps/apple-green.png
-share/pixmaps/apple-red.png
 share/pixmaps/gnome-amusements.png
 share/pixmaps/gnome-aorta.png
 share/pixmaps/gnome-applets.png
@@ -682,8 +699,8 @@ share/pixmaps/gnome-file-h.png
 share/pixmaps/gnome-fish.png
 share/pixmaps/gnome-folder.png
 share/pixmaps/gnome-gegl.png
-share/pixmaps/gnome-gegl2.png
 share/pixmaps/gnome-gegl2-2.png
+share/pixmaps/gnome-gegl2.png
 share/pixmaps/gnome-gemvt.png
 share/pixmaps/gnome-gimp.png
 share/pixmaps/gnome-globe.png
@@ -692,7 +709,6 @@ share/pixmaps/gnome-gmush.png
 share/pixmaps/gnome-gnomine.png
 share/pixmaps/gnome-graphics.png
 share/pixmaps/gnome-gsame.png
-share/pixmaps/gtkvim.png
 share/pixmaps/gnome-help.png
 share/pixmaps/gnome-hint.png
 share/pixmaps/gnome-html.png
@@ -740,8 +756,10 @@ share/pixmaps/gnome-user-interface.png
 share/pixmaps/gnome-util.png
 share/pixmaps/gnome-word.png
 share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
 share/pixmaps/kterm.xpm
 share/pixmaps/launcher-program.png
+share/pixmaps/mailcheck/eclouds.png
 share/pixmaps/mailcheck/email-e.png
 share/pixmaps/mailcheck/email-eclouds.png
 share/pixmaps/mailcheck/email-tiny.png
@@ -779,39 +797,49 @@ share/pixmaps/tiles/tile-purple-up.png
 share/pixmaps/tiles/tile-sand-down.png
 share/pixmaps/tiles/tile-sand-up.png
 share/pixmaps/vnterm.xpm
-@dirrm share/gnome-about
 @dirrm share/pixmaps/tiles
 @dirrm share/pixmaps/splash
 @dirrm share/pixmaps/mailcheck
 @dirrm share/pixmaps/fish
 @dirrm share/mc/templates
 @dirrm share/mc
-@dirrm share/gnome/help/clock_applet/C/stylesheet-images
-@dirrm share/gnome/help/clock_applet/C
-@dirrm share/gnome/help/clock_applet/da/stylesheet-images
-@dirrm share/gnome/help/clock_applet/da
-@dirrm share/gnome/help/clock_applet
-@dirrm share/gnome/help/desk-guide_applet/C/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/C
-@dirrm share/gnome/help/desk-guide_applet/de/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/de
-@dirrm share/gnome/help/desk-guide_applet
-@dirrm share/gnome/help/fish_applet/C/stylesheet-images
-@dirrm share/gnome/help/fish_applet/C
-@dirrm share/gnome/help/fish_applet/da/stylesheet-images
-@dirrm share/gnome/help/fish_applet/da
-@dirrm share/gnome/help/fish_applet/no/stylesheet-images
-@dirrm share/gnome/help/fish_applet/no
-@dirrm share/gnome/help/fish_applet
-@dirrm share/gnome/help/help-browser/gl
-@dirrm share/gnome/help/help-browser/lt
-@dirrm share/gnome/help/help-browser/uk
+@dirrm share/gnome/html/panel
+@dirrm share/gnome/hints
+@dirrm share/gnome/help/tasklist_applet/C/stylesheet-images
+@dirrm share/gnome/help/tasklist_applet/C
+@dirrm share/gnome/help/tasklist_applet
+@dirrm share/gnome/help/session/C/stylesheet-images
+@dirrm share/gnome/help/session/C
+@dirrm share/gnome/help/session
+@dirrm share/gnome/help/printer_applet/da/stylesheet-images
+@dirrm share/gnome/help/printer_applet/da
+@dirrm share/gnome/help/printer_applet/C/stylesheet-images
+@dirrm share/gnome/help/printer_applet/C
+@dirrm share/gnome/help/printer_applet
+@dirrm share/gnome/help/panel/it/stylesheet-images
+@dirrm share/gnome/help/panel/it/figures
+@dirrm share/gnome/help/panel/it
+@dirrm share/gnome/help/panel/de/stylesheet-images
+@dirrm share/gnome/help/panel/de/figures
+@dirrm share/gnome/help/panel/de
+@dirrm share/gnome/help/panel/C/stylesheet-images
+@dirrm share/gnome/help/panel/C/figures
+@dirrm share/gnome/help/panel/C
+@dirrm share/gnome/help/panel
+@dirrm share/gnome/help/mailcheck_applet/da/stylesheet-images
+@dirrm share/gnome/help/mailcheck_applet/da
+@dirrm share/gnome/help/mailcheck_applet/C/stylesheet-images
+@dirrm share/gnome/help/mailcheck_applet/C
+@dirrm share/gnome/help/mailcheck_applet
 @dirrm share/gnome/help/help-browser/wa
+@dirrm share/gnome/help/help-browser/uk
 @dirrm share/gnome/help/help-browser/no
+@dirrm share/gnome/help/help-browser/lt
 @dirrm share/gnome/help/help-browser/ko
 @dirrm share/gnome/help/help-browser/ja
 @dirrm share/gnome/help/help-browser/it
 @dirrm share/gnome/help/help-browser/hu
+@dirrm share/gnome/help/help-browser/gl
 @dirrm share/gnome/help/help-browser/fr
 @dirrm share/gnome/help/help-browser/eu
 @dirrm share/gnome/help/help-browser/et
@@ -821,52 +849,44 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/help-browser/ca
 @dirrm share/gnome/help/help-browser/C
 @dirrm share/gnome/help/help-browser
-@dirrm share/gnome/help/gen_util_applet/de/stylesheet-images
-@dirrm share/gnome/help/gen_util_applet/de
-@dirrm share/gnome/help/gen_util_applet/no/stylesheet-images
-@dirrm share/gnome/help/gen_util_applet/no
-@dirrm share/gnome/help/gen_util_applet
-@dirrm share/gnome/help/gnome-terminal/de
-@dirrm share/gnome/help/gnome-terminal/es/stylesheet-images
-@dirrm share/gnome/help/gnome-terminal/es
+@dirrm share/gnome/help/gnome-terminal/no/stylesheet-images
+@dirrm share/gnome/help/gnome-terminal/no
 @dirrm share/gnome/help/gnome-terminal/it/stylesheet-images
 @dirrm share/gnome/help/gnome-terminal/it
+@dirrm share/gnome/help/gnome-terminal/es/stylesheet-images
+@dirrm share/gnome/help/gnome-terminal/es
+@dirrm share/gnome/help/gnome-terminal/de
 @dirrm share/gnome/help/gnome-terminal/da/stylesheet-images
 @dirrm share/gnome/help/gnome-terminal/da
-@dirrm share/gnome/help/gnome-terminal/no/stylesheet-images
-@dirrm share/gnome/help/gnome-terminal/no
 @dirrm share/gnome/help/gnome-terminal/C/stylesheet-images
 @dirrm share/gnome/help/gnome-terminal/C
 @dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/help/mailcheck_applet/C/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/C
-@dirrm share/gnome/help/mailcheck_applet/da/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/da
-@dirrm share/gnome/help/mailcheck_applet
-@dirrm share/gnome/help/panel/C/figures
-@dirrm share/gnome/help/panel/C/stylesheet-images
-@dirrm share/gnome/help/panel/C
-@dirrm share/gnome/help/panel/de/figures
-@dirrm share/gnome/help/panel/de/stylesheet-images
-@dirrm share/gnome/help/panel/de
-@dirrm share/gnome/help/panel/it/figures
-@dirrm share/gnome/help/panel/it/stylesheet-images
-@dirrm share/gnome/help/panel/it
-@dirrm share/gnome/help/panel
-@dirrm share/gnome/help/printer_applet/C/stylesheet-images
-@dirrm share/gnome/help/printer_applet/C
-@dirrm share/gnome/help/printer_applet/da/stylesheet-images
-@dirrm share/gnome/help/printer_applet/da
-@dirrm share/gnome/help/printer_applet
-@dirrm share/gnome/help/session/C/stylesheet-images
-@dirrm share/gnome/help/session/C
-@dirrm share/gnome/help/session
-@dirrm share/gnome/help/tasklist_applet/C/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/C
-@dirrm share/gnome/help/tasklist_applet
-@dirrm share/gnome/html/panel
+@dirrm share/gnome/help/gen_util_applet/no/stylesheet-images
+@dirrm share/gnome/help/gen_util_applet/no
+@dirrm share/gnome/help/gen_util_applet/de/stylesheet-images
+@dirrm share/gnome/help/gen_util_applet/de
+@dirrm share/gnome/help/gen_util_applet
+@dirrm share/gnome/help/fish_applet/no/stylesheet-images
+@dirrm share/gnome/help/fish_applet/no
+@dirrm share/gnome/help/fish_applet/da/stylesheet-images
+@dirrm share/gnome/help/fish_applet/da
+@dirrm share/gnome/help/fish_applet/C/stylesheet-images
+@dirrm share/gnome/help/fish_applet/C
+@dirrm share/gnome/help/fish_applet
+@dirrm share/gnome/help/desk-guide_applet/de/stylesheet-images
+@dirrm share/gnome/help/desk-guide_applet/de
+@dirrm share/gnome/help/desk-guide_applet/C/stylesheet-images
+@dirrm share/gnome/help/desk-guide_applet/C
+@dirrm share/gnome/help/desk-guide_applet
+@dirrm share/gnome/help/clock_applet/da/stylesheet-images
+@dirrm share/gnome/help/clock_applet/da
+@dirrm share/gnome/help/clock_applet/C/stylesheet-images
+@dirrm share/gnome/help/clock_applet/C
+@dirrm share/gnome/help/clock_applet
 @unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/System 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps/Settings/Session 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps/Settings/Desktop 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Settings 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
@@ -874,7 +894,8 @@ share/pixmaps/vnterm.xpm
 @unexec rmdir %D/share/gnome/apps/Games 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Applications 2>/dev/null || true
-@dirrm share/gnome/hints
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@dirrm share/gnome-about
 @dirrm share/applets/Utility
 @dirrm share/applets/Network
 @dirrm share/applets/Multimedia