6 files changed, 167 insertions, 245 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index a6a3b87785cf..1881e1d49faa 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.45 2006/07/27 00:40:38 marcus Exp $
-#
+#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,12 +16,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
 
-BUILD_DEPENDS=	${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-RUN_DEPENDS=	${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+LIB_DEPENDS=	oobs-1.3:${PORTSDIR}/devel/liboobs
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
 USE_XLIB=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
@@ -35,10 +34,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	uses symbols not present in 4.X
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${prefix}/$${DATADIRNAME}|$${datadir}|g' \
+	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index dea2f0713697..f774a5b8f0f8 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
-SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
-SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
+MD5 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = af305872b4bd72802915b007a7015010
+SHA256 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = de4667c8a95c55e1936b19d3bed85507a37f0eabcaa1f2eadd3c7ef89e39c480
+SIZE (gnome2/gnome-system-tools-2.18.0.tar.bz2) = 2815588
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
deleted file mode 100644
index 712bb1defc9f..000000000000
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jan 13 17:15:39 2005
-+++ configure	Thu Jan 13 17:17:13 2005
-@@ -22990,7 +22990,7 @@
- GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
- 
- GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
--GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
-+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
- 
- GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
- GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in"
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index f73b28ae4d10..000000000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/common/gst-auth.c.orig	Mon Aug  8 15:00:01 2005
-+++ src/common/gst-auth.c	Sat Sep 10 01:47:35 2005
-@@ -55,6 +55,82 @@
- static int root;			/* if we are root, no password is
- 					   required */
- 
-+#ifdef __FreeBSD__
-+static int
-+_forkpty (int *amaster, char *name,
-+	  struct termios *termp, struct winsize *winp)
-+{
-+	int master, slave;
-+	char *line;
-+	pid_t pid;
-+
-+	master = posix_openpt (O_RDWR);
-+	if (master == -1)
-+		return (-1);
-+
-+	if (grantpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (unlockpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	line = ptsname (master);
-+	if (line == NULL)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	slave = open (line, O_RDWR);
-+	if (slave < 0)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (amaster)
-+		*amaster = master;
-+
-+	if (name)
-+		strcpy (name, line);
-+
-+	if (termp)
-+		(void) tcsetattr(slave, TCSAFLUSH, termp);
-+
-+	if (winp)
-+		(void) ioctl(slave, TIOCSWINSZ, (char *) winp);
-+
-+	pid = fork ();
-+	switch (pid)
-+	{
-+		case -1:
-+			(void) close (slave);
-+			(void) close (master);
-+			return (-1);
-+		case 0:
-+			(void) close (master);
-+			dup2 (slave, STDIN_FILENO);
-+			dup2 (slave, STDOUT_FILENO);
-+			dup2 (slave, STDERR_FILENO);
-+			return (0);
-+		default:
-+			(void) close (slave);
-+			return (pid);
-+	}
-+
-+	(void) close (master);
-+	return (-1);
-+}
-+#else
-+#define _forkpty forkpty
-+#endif
-+
- static void
- gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text)
- {
-@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar 
- 	int p[2];
- 
- 	pipe (p);
--	tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL);
-+	tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL);
- 
- 	if (tool->backend_pid < 0) {
- 		gst_auth_display_error_message (tool,
-@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar 
- 		unsetenv("LANG");
- 		unsetenv("LANGUAGE");
- 
--		dup2 (p[1], 1);
--		dup2 (p[1], 2);
-+		dup2 (p[1], STDOUT_FILENO);
-+		dup2 (p[1], STDERR_FILENO);
- 		close (p[0]);
- 
- 		execv (args[0], args);
--		exit (255);
-+		_exit (255);
- 	} else {
- #ifndef __FreeBSD__
- 		/* Linux's su works ok with echo disabling */
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
deleted file mode 100644
index 9aaef15031fd..000000000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-tool.c.orig	Tue Jun 21 15:07:05 2005
-+++ src/common/gst-tool.c	Wed Jul  6 01:28:22 2005
-@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn
- 		if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED)
- 			tool->root_access = ROOT_ACCESS_SIMULATED;
- 
-+#if 0
-+		/*
-+		 * We do not need to wait for the tool,
-+		 * as it will get SIGPIPE anyway.
-+		 * This waitpid causes problems on FreeBSD.
-+		 */
- 		waitpid (tool->backend_pid, NULL, 0);
-+#endif
- 	}
- }
- 
-@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool)
- 	struct pollfd fd;
- 
- 	fd.fd = tool->read_fd;
--	fd.events = POLLIN || POLLPRI;
-+	fd.events = POLLIN | POLLPRI;
- 
- 	while (poll (&fd, 1, 100) <= 0) {
- 		while (gtk_events_pending ())
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 3f9b6a1a9832..48f75de4614a 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -7,137 +7,133 @@ lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-%%DATADIR%%/interfaces/boot.glade
-%%DATADIR%%/interfaces/common.glade
-%%DATADIR%%/interfaces/disks.glade
-%%DATADIR%%/interfaces/network.glade
-%%DATADIR%%/interfaces/services.glade
-%%DATADIR%%/interfaces/shares.glade
-%%DATADIR%%/interfaces/time.glade
-%%DATADIR%%/interfaces/users.glade
-%%DATADIR%%/pixmaps/16_ethernet.xpm
-%%DATADIR%%/pixmaps/16_loopback.xpm
-%%DATADIR%%/pixmaps/16_plip.xpm
-%%DATADIR%%/pixmaps/16_ppp.xpm
-%%DATADIR%%/pixmaps/archlinux.png
-%%DATADIR%%/pixmaps/black_panther.png
-%%DATADIR%%/pixmaps/boot.png
-%%DATADIR%%/pixmaps/computer.png
-%%DATADIR%%/pixmaps/conectiva.png
-%%DATADIR%%/pixmaps/connection-ethernet.png
-%%DATADIR%%/pixmaps/connection-modem.png
-%%DATADIR%%/pixmaps/debian.png
-%%DATADIR%%/pixmaps/disks.png
-%%DATADIR%%/pixmaps/fedora.png
-%%DATADIR%%/pixmaps/freebsd.png
-%%DATADIR%%/pixmaps/gentoo.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-data.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-mixed.png
-%%DATADIR%%/pixmaps/irda-16.png
-%%DATADIR%%/pixmaps/irda-48.png
-%%DATADIR%%/pixmaps/mandrake.png
-%%DATADIR%%/pixmaps/nameresolution.png
-%%DATADIR%%/pixmaps/nameresolution_alias.png
-%%DATADIR%%/pixmaps/nameresolution_id.png
-%%DATADIR%%/pixmaps/network.png
-%%DATADIR%%/pixmaps/openna.png
-%%DATADIR%%/pixmaps/pld.png
-%%DATADIR%%/pixmaps/plip-48.png
-%%DATADIR%%/pixmaps/ppp.png
-%%DATADIR%%/pixmaps/reading.png
-%%DATADIR%%/pixmaps/redhat.png
-%%DATADIR%%/pixmaps/server.png
-%%DATADIR%%/pixmaps/services.png
-%%DATADIR%%/pixmaps/settings.png
-%%DATADIR%%/pixmaps/shares.png
-%%DATADIR%%/pixmaps/slackware.png
-%%DATADIR%%/pixmaps/specifix.png
-%%DATADIR%%/pixmaps/suse.png
-%%DATADIR%%/pixmaps/talk-userlist.png
-%%DATADIR%%/pixmaps/time.png
-%%DATADIR%%/pixmaps/timezone.png
-%%DATADIR%%/pixmaps/turbolinux.png
-%%DATADIR%%/pixmaps/unsupported-distro.png
-%%DATADIR%%/pixmaps/users-groups.png
-%%DATADIR%%/pixmaps/users.png
-%%DATADIR%%/pixmaps/vidalinux.png
-%%DATADIR%%/pixmaps/vine.png
-%%DATADIR%%/pixmaps/wavelan-16.png
-%%DATADIR%%/pixmaps/wavelan-48.png
-%%DATADIR%%/pixmaps/world_map-960.png
 share/gnome/applications/network.desktop
 share/gnome/applications/services.desktop
 share/gnome/applications/shares.desktop
 share/gnome/applications/time.desktop
 share/gnome/applications/users.desktop
-share/gnome/help/boot-admin/C/boot-admin.xml
-share/gnome/help/boot-admin/C/figures/boot-tool.png
-share/gnome/help/boot-admin/C/legal.xml
-share/gnome/help/boot-admin/es/boot-admin.xml
-share/gnome/help/boot-admin/es/figures/boot-tool.png
+share/gnome/gnome-system-tools/interfaces/boot.glade
+share/gnome/gnome-system-tools/interfaces/common.glade
+share/gnome/gnome-system-tools/interfaces/disks.glade
+share/gnome/gnome-system-tools/interfaces/network.glade
+share/gnome/gnome-system-tools/interfaces/services.glade
+share/gnome/gnome-system-tools/interfaces/shares.glade
+share/gnome/gnome-system-tools/interfaces/time.glade
+share/gnome/gnome-system-tools/interfaces/users.glade
+share/gnome/gnome-system-tools/pixmaps/world_map-960.png
 share/gnome/help/network-admin/C/figures/network-tool.png
 share/gnome/help/network-admin/C/legal.xml
 share/gnome/help/network-admin/C/network-admin.xml
 share/gnome/help/network-admin/es/figures/network-tool.png
 share/gnome/help/network-admin/es/network-admin.xml
-share/gnome/help/services-admin/C/figures/service-properties.png
+share/gnome/help/network-admin/fr/figures/network-tool.png
+share/gnome/help/network-admin/fr/network-admin.xml
+share/gnome/help/network-admin/sv/figures/network-tool.png
+share/gnome/help/network-admin/sv/network-admin.xml
 share/gnome/help/services-admin/C/figures/services-tool.png
 share/gnome/help/services-admin/C/legal.xml
 share/gnome/help/services-admin/C/services-admin.xml
-share/gnome/help/services-admin/es/figures/service-properties.png
 share/gnome/help/services-admin/es/figures/services-tool.png
 share/gnome/help/services-admin/es/services-admin.xml
+share/gnome/help/services-admin/fr/figures/services-tool.png
+share/gnome/help/services-admin/fr/services-admin.xml
 share/gnome/help/services-admin/nl/figures/service-properties.png
 share/gnome/help/services-admin/nl/figures/services-tool.png
 share/gnome/help/services-admin/nl/legal.xml
 share/gnome/help/services-admin/nl/services-admin.xml
+share/gnome/help/services-admin/sv/figures/services-tool.png
+share/gnome/help/services-admin/sv/services-admin.xml
+share/gnome/help/shares-admin/C/figures/shares-tool.png
+share/gnome/help/shares-admin/C/legal.xml
+share/gnome/help/shares-admin/C/shares-admin.xml
+share/gnome/help/shares-admin/sv/figures/shares-tool.png
+share/gnome/help/shares-admin/sv/shares-admin.xml
 share/gnome/help/time-admin/C/figures/time-map.png
 share/gnome/help/time-admin/C/figures/time-servers.png
-share/gnome/help/time-admin/C/figures/time-tool.png
+share/gnome/help/time-admin/C/figures/time-tool-automatic.png
+share/gnome/help/time-admin/C/figures/time-tool-manual.png
 share/gnome/help/time-admin/C/legal.xml
 share/gnome/help/time-admin/C/time-admin.xml
 share/gnome/help/time-admin/es/figures/time-map.png
 share/gnome/help/time-admin/es/figures/time-servers.png
-share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/figures/time-tool-automatic.png
+share/gnome/help/time-admin/es/figures/time-tool-manual.png
 share/gnome/help/time-admin/es/time-admin.xml
+share/gnome/help/time-admin/fr/figures/time-map.png
+share/gnome/help/time-admin/fr/figures/time-servers.png
+share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
+share/gnome/help/time-admin/fr/figures/time-tool-manual.png
+share/gnome/help/time-admin/fr/time-admin.xml
 share/gnome/help/time-admin/nl/figures/time-map.png
 share/gnome/help/time-admin/nl/figures/time-servers.png
 share/gnome/help/time-admin/nl/figures/time-tool.png
 share/gnome/help/time-admin/nl/legal.xml
 share/gnome/help/time-admin/nl/time-admin.xml
+share/gnome/help/time-admin/ru/figures/time-map.png
+share/gnome/help/time-admin/ru/figures/time-servers.png
+share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
+share/gnome/help/time-admin/ru/figures/time-tool-manual.png
+share/gnome/help/time-admin/ru/time-admin.xml
+share/gnome/help/time-admin/sv/figures/time-map.png
+share/gnome/help/time-admin/sv/figures/time-servers.png
+share/gnome/help/time-admin/sv/figures/time-tool-automatic.png
+share/gnome/help/time-admin/sv/figures/time-tool-manual.png
+share/gnome/help/time-admin/sv/time-admin.xml
 share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
 share/gnome/help/users-admin/es/figures/users-tool.png
 share/gnome/help/users-admin/es/users-admin.xml
-share/gnome/omf/boot-admin/boot-admin-C.omf
-share/gnome/omf/boot-admin/boot-admin-es.omf
+share/gnome/help/users-admin/fr/figures/users-tool.png
+share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/ru/figures/users-tool.png
+share/gnome/help/users-admin/ru/users-admin.xml
+share/gnome/help/users-admin/sv/figures/users-tool.png
+share/gnome/help/users-admin/sv/users-admin.xml
 share/gnome/omf/gnome-system-tools/services-admin-nl.omf
 share/gnome/omf/gnome-system-tools/time-admin-nl.omf
 share/gnome/omf/network-admin/network-admin-C.omf
 share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/network-admin/network-admin-fr.omf
+share/gnome/omf/network-admin/network-admin-sv.omf
 share/gnome/omf/services-admin/services-admin-C.omf
 share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/services-admin/services-admin-fr.omf
+share/gnome/omf/services-admin/services-admin-sv.omf
+share/gnome/omf/shares-admin/shares-admin-C.omf
+share/gnome/omf/shares-admin/shares-admin-sv.omf
 share/gnome/omf/time-admin/time-admin-C.omf
 share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/time-admin/time-admin-fr.omf
+share/gnome/omf/time-admin/time-admin-ru.omf
+share/gnome/omf/time-admin/time-admin-sv.omf
 share/gnome/omf/users-admin/users-admin-C.omf
 share/gnome/omf/users-admin/users-admin-es.omf
+share/gnome/omf/users-admin/users-admin-fr.omf
+share/gnome/omf/users-admin/users-admin-ru.omf
+share/gnome/omf/users-admin/users-admin-sv.omf
+share/icons/hicolor/48x48/devices/irda.png
+share/icons/hicolor/48x48/devices/plip.png
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
+share/locale/be/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
+share/locale/dz/LC_MESSAGES/gnome-system-tools.mo
 share/locale/el/LC_MESSAGES/gnome-system-tools.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
 share/locale/es/LC_MESSAGES/gnome-system-tools.mo
 share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
@@ -150,10 +146,12 @@ share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/id/LC_MESSAGES/gnome-system-tools.mo
 share/locale/it/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ka/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
 share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
 share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
+share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
@@ -162,7 +160,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/gnome-system-tools.mo
+share/locale/or/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
@@ -185,44 +183,112 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+@dirrm share/locale/zh_TW/LC_MESSAGES
+@dirrm share/locale/zh_TW
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
+@dirrm share/locale/zh_CN/LC_MESSAGES
+@dirrm share/locale/zh_CN
+@dirrm share/locale/xh/LC_MESSAGES
+@dirrm share/locale/xh
+@dirrm share/locale/uk/LC_MESSAGES
+@dirrm share/locale/uk
+@dirrm share/locale/sr/LC_MESSAGES
+@dirrm share/locale/sr
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/sk
+@dirrm share/locale/rw/LC_MESSAGES
+@dirrm share/locale/rw
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/nn/LC_MESSAGES
+@dirrm share/locale/nn
+@dirrm share/locale/ne/LC_MESSAGES
+@dirrm share/locale/ne
+@dirrm share/locale/mg/LC_MESSAGES
+@dirrm share/locale/mg
+@dirrm share/locale/ku/LC_MESSAGES
+@dirrm share/locale/ku
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+@dirrm share/locale/gl/LC_MESSAGES
+@dirrm share/locale/gl
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/dz/LC_MESSAGES
+@dirrm share/locale/dz
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@dirrm share/locale/bn_IN/LC_MESSAGES
+@dirrm share/locale/bn_IN
+@dirrm share/locale/be/LC_MESSAGES
+@dirrm share/locale/be
 @dirrm share/gnome/omf/users-admin
 @dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/shares-admin
 @dirrm share/gnome/omf/services-admin
 @dirrm share/gnome/omf/network-admin
 @dirrm share/gnome/omf/gnome-system-tools
-@dirrm share/gnome/omf/boot-admin
-@dirrm share/gnome/help/users-admin/C/figures
-@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/sv/figures
+@dirrm share/gnome/help/users-admin/sv
+@dirrm share/gnome/help/users-admin/ru/figures
+@dirrm share/gnome/help/users-admin/ru
+@dirrm share/gnome/help/users-admin/fr/figures
+@dirrm share/gnome/help/users-admin/fr
 @dirrm share/gnome/help/users-admin/es/figures
 @dirrm share/gnome/help/users-admin/es
+@dirrm share/gnome/help/users-admin/C/figures
+@dirrm share/gnome/help/users-admin/C
 @dirrm share/gnome/help/users-admin
+@dirrm share/gnome/help/time-admin/sv/figures
+@dirrm share/gnome/help/time-admin/sv
+@dirrm share/gnome/help/time-admin/ru/figures
+@dirrm share/gnome/help/time-admin/ru
 @dirrm share/gnome/help/time-admin/nl/figures
 @dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/fr/figures
+@dirrm share/gnome/help/time-admin/fr
 @dirrm share/gnome/help/time-admin/es/figures
 @dirrm share/gnome/help/time-admin/es
 @dirrm share/gnome/help/time-admin/C/figures
 @dirrm share/gnome/help/time-admin/C
 @dirrm share/gnome/help/time-admin
+@dirrm share/gnome/help/shares-admin/sv/figures
+@dirrm share/gnome/help/shares-admin/sv
+@dirrm share/gnome/help/shares-admin/C/figures
+@dirrm share/gnome/help/shares-admin/C
+@dirrm share/gnome/help/shares-admin
+@dirrm share/gnome/help/services-admin/sv/figures
+@dirrm share/gnome/help/services-admin/sv
 @dirrm share/gnome/help/services-admin/nl/figures
 @dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/fr/figures
+@dirrm share/gnome/help/services-admin/fr
 @dirrm share/gnome/help/services-admin/es/figures
 @dirrm share/gnome/help/services-admin/es
 @dirrm share/gnome/help/services-admin/C/figures
 @dirrm share/gnome/help/services-admin/C
 @dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/sv/figures
+@dirrm share/gnome/help/network-admin/sv
+@dirrm share/gnome/help/network-admin/fr/figures
+@dirrm share/gnome/help/network-admin/fr
 @dirrm share/gnome/help/network-admin/es/figures
 @dirrm share/gnome/help/network-admin/es
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
-@dirrm share/gnome/help/boot-admin/es/figures
-@dirrm share/gnome/help/boot-admin/es
-@dirrm share/gnome/help/boot-admin/C/figures
-@dirrm share/gnome/help/boot-admin/C
-@dirrm share/gnome/help/boot-admin
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/interfaces
-@dirrm %%DATADIR%%
+@dirrm share/gnome/gnome-system-tools/pixmaps
+@dirrm share/gnome/gnome-system-tools/interfaces
+@dirrm share/gnome/gnome-system-tools
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -245,12 +311,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/ko/LC_MESSAGES
@@ -261,7 +327,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be