Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

5 files changed, 398 insertions, 215 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 65bc73beac0d..ecb39d9b3e66 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.141 2006/10/08 02:12:50 marcus Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.152 2007/03/12 17:47:04 marcus Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.16.2
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +16,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applets components for the GNOME 2 Desktop Environment
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \
-    		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		xklavier.11:${PORTSDIR}/x11/libxklavier \
-		gucharmap.5:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/system-tools-backends \
-    		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
@@ -34,7 +33,7 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
-		gail gnomedocutils
+		gail gnomedocutils libgnomekbd
 WANT_GNOME=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
@@ -101,6 +100,8 @@ PLIST_SUB+=	PYTHON="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/libgweather/weather-met.c
+	@${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \
+	    	${WRKSRC}/configure
 .if !defined(USE_PYTHON)
 	@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
 		${WRKSRC}/configure
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index ae985f3f785a..14fb514cff2b 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.16.2.tar.bz2) = 1a46b8557ff05ca75e7db6adb4dd6707
-SHA256 (gnome2/gnome-applets-2.16.2.tar.bz2) = de3c9d92c5da1597dbcdc5d4a7554235006d0bf6432f97ab7b0a6a5a47dbb67b
-SIZE (gnome2/gnome-applets-2.16.2.tar.bz2) = 7127753
+MD5 (gnome2/gnome-applets-2.18.0.tar.bz2) = db3ef99c00335798f30fc0a9162c0257
+SHA256 (gnome2/gnome-applets-2.18.0.tar.bz2) = f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
+SIZE (gnome2/gnome-applets-2.18.0.tar.bz2) = 7133902
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 53841b6d7346..e7f0e210d28d 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -63,52 +63,6 @@
                  NULL
          };
          static const gchar *const documenters[] = {
---- cpufreq/src/Makefile.in.orig	Sat Jun 17 13:42:50 2006
-+++ cpufreq/src/Makefile.in	Sat Jun 17 14:03:45 2006
-@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
- 	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
- 	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
- 	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
--	cpufreq-monitor-cpuinfo.h
-+	cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
-+	cpufreq-monitor-sysctl.h
- @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
- @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
- am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
- 	cpufreq-monitor-factory.$(OBJEXT) \
- 	cpufreq-monitor-procfs.$(OBJEXT) \
- 	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
--	cpufreq-monitor-cpuinfo.$(OBJEXT)
-+	cpufreq-monitor-cpuinfo.$(OBJEXT) \
-+	cpufreq-monitor-sysctl.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po \
-@@ -397,6 +400,7 @@ cpufreq_applet_SOURCES = \
- 	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
- 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
- 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
-+	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
- 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
- 	$(cpufreq_files)						\
- 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
-@@ -482,6 +486,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
 --- cpufreq/src/cpufreq-monitor-sysctl.h.orig	Sat Jun 17 14:05:37 2006
 +++ cpufreq/src/cpufreq-monitor-sysctl.h	Sat Jun 17 14:14:13 2006
 @@ -0,0 +1,49 @@
@@ -161,9 +115,111 @@
 +CPUFreqMonitor *cpufreq_monitor_sysctl_new      (guint cpu);
 +
 +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-monitor-sysctl.c.orig	Sat Jun 17 14:15:55 2006
-+++ cpufreq/src/cpufreq-monitor-sysctl.c	Sat Jun 24 01:45:23 2006
-@@ -0,0 +1,161 @@
+--- cpufreq/src/cpufreq-monitor-factory.c.orig	Sat Jun 17 06:28:02 2006
++++ cpufreq/src/cpufreq-monitor-factory.c	Sat Jun 24 01:45:54 2006
+@@ -17,6 +17,7 @@
+  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+  * Authors : Carlos García Campos <carlosgc@gnome.org>
++ *           Joe Marcus Clarke <marcus@FreeBSD.org>
+  */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -25,11 +26,18 @@
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+ 
+ #include "cpufreq-applet.h"
+ #include "cpufreq-utils.h"
+ #include "cpufreq-monitor-sysfs.h"
+ #include "cpufreq-monitor-procfs.h"
++#ifdef __FreeBSD__
++#include "cpufreq-monitor-sysctl.h"
++#endif /* __FreeBSD__ */
+ #include "cpufreq-monitor-cpuinfo.h"
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-monitor-libcpufreq.h"
+@@ -40,6 +48,7 @@ CPUFreqMonitor *
+ cpufreq_monitor_factory_create_monitor (guint cpu)
+ {
+ 	   CPUFreqMonitor *monitor = NULL;
++#ifndef __FreeBSD__
+ 
+ #ifdef HAVE_LIBCPUFREQ
+ 	   monitor = cpufreq_monitor_libcpufreq_new (cpu);
+@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
+ 		   
+ 		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
+ 	   }
++#else
++	   size_t len;
++
++	   if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
++		   monitor = cpufreq_monitor_sysctl_new (cpu);
++	   } else {
++		   cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
++				   		_("You will not be able to modify the frequency of your machine.  "
++						"Your machine may be misconfigured or not have hardware support "
++						"for CPU frequency scaling."));
++		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
++	   }
++#endif /* __FreeBSD__ */
+ 	   
+ 	   return monitor;
+ }
+--- cpufreq/src/cpufreq-utils.c.orig	Sat Aug 12 21:26:50 2006
++++ cpufreq/src/cpufreq-utils.c	Tue Aug 22 11:07:32 2006
+@@ -22,6 +22,9 @@
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#include <sys/sysctl.h>
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -30,6 +33,24 @@
+ 
+ #include "cpufreq-utils.h"
+ 
++#ifdef __FreeBSD__
++guint
++cpufreq_utils_get_n_cpus (void)
++{
++	size_t len;
++	static guint n_cpus = 0;
++
++	if (n_cpus > 0)
++		return n_cpus;
++
++	len = sizeof (n_cpus);
++	if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
++		return 1;
++	}
++
++	return n_cpus;
++}
++#else
+ guint
+ cpufreq_utils_get_n_cpus (void)
+ {
+@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
+ 	
+ 	return 1;
+ }
++#endif /* __FreeBSD__ */
+ 
+ void
+ cpufreq_utils_display_error (const gchar *message,
+--- cpufreq/src/cpufreq-monitor-sysctl.c.orig	Wed Feb 28 14:03:58 2007
++++ cpufreq/src/cpufreq-monitor-sysctl.c	Wed Feb 28 14:28:47 2007
+@@ -0,0 +1,176 @@
 +/*
 + * Copyright (C) 2001, 2002 Free Software Foundation
 + *
@@ -203,6 +259,7 @@
 +
 +static gboolean     cpufreq_monitor_sysctl_run                       (CPUFreqMonitor *monitor);
 +static GList   *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor);
++static GList   *cpufreq_monitor_sysctl_get_available_governors   (CPUFreqMonitor *monitor);
 +
 +static gboolean cpufreq_monitor_sysctl_get                       (gpointer gdata);
 +
@@ -220,6 +277,7 @@
 +
 +	monitor_class->run = cpufreq_monitor_sysctl_run;
 +	monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
++	monitor_class->get_available_governors = cpufreq_monitor_sysctl_get_available_governors;
 +}
 +
 +CPUFreqMonitor *
@@ -242,7 +300,7 @@
 +	   guint                    mon_cpu;
 +	   GList                   *list;
 +
-+	   list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor));
++	   list = cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor));
 +
 +	   fmax = atoi ((gchar *) list->data);
 +	   fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1)));
@@ -263,9 +321,10 @@
 +	   else if (ifreq == fmin)
 +	       		 governor = g_strdup ("economy");
 +	   else
-+	       		 governor = g_strdup ("other");
++	       		 governor = g_strdup ("userspace");
 +
 +	   g_object_set (G_OBJECT (monitor),
++			 "online", TRUE,
 +			 "governor", governor,
 +			 "frequency", ifreq,
 +			 "max-frequency", fmax,
@@ -324,106 +383,62 @@
 +
 +	   return (list);
 +}
-+#endif /* __FreeBSD__ */
---- cpufreq/src/cpufreq-monitor-factory.c.orig	Sat Jun 17 06:28:02 2006
-+++ cpufreq/src/cpufreq-monitor-factory.c	Sat Jun 24 01:45:54 2006
-@@ -17,6 +17,7 @@
-  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  *
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ *           Joe Marcus Clarke <marcus@FreeBSD.org>
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -25,11 +26,18 @@
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- 
- #include "cpufreq-applet.h"
- #include "cpufreq-utils.h"
- #include "cpufreq-monitor-sysfs.h"
- #include "cpufreq-monitor-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-monitor-sysctl.h"
-+#endif /* __FreeBSD__ */
- #include "cpufreq-monitor-cpuinfo.h"
- #ifdef HAVE_LIBCPUFREQ
- #include "cpufreq-monitor-libcpufreq.h"
-@@ -40,6 +48,7 @@ CPUFreqMonitor *
- cpufreq_monitor_factory_create_monitor (guint cpu)
- {
- 	   CPUFreqMonitor *monitor = NULL;
-+#ifndef __FreeBSD__
- 
- #ifdef HAVE_LIBCPUFREQ
- 	   monitor = cpufreq_monitor_libcpufreq_new (cpu);
-@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
- 		   
- 		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
- 	   }
-+#else
-+	   size_t len;
 +
-+	   if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+		   monitor = cpufreq_monitor_sysctl_new (cpu);
-+	   } else {
-+		   cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
-+				   		_("You will not be able to modify the frequency of your machine.  "
-+						"Your machine may be misconfigured or not have hardware support "
-+						"for CPU frequency scaling."));
-+		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
-+	   }
-+#endif /* __FreeBSD__ */
- 	   
- 	   return monitor;
- }
---- cpufreq/src/cpufreq-utils.c.orig	Sat Aug 12 21:26:50 2006
-+++ cpufreq/src/cpufreq-utils.c	Tue Aug 22 11:07:32 2006
-@@ -22,6 +22,9 @@
- #include <glib.h>
- #include <gtk/gtkmessagedialog.h>
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#endif
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -30,6 +33,24 @@
- 
- #include "cpufreq-utils.h"
- 
-+#ifdef __FreeBSD__
-+guint
-+cpufreq_utils_get_n_cpus (void)
++static GList *
++cpufreq_monitor_sysctl_get_available_governors (CPUFreqMonitor *monitor)
 +{
-+	size_t len;
-+	static guint n_cpus = 0;
++	GList *list = NULL;
 +
-+	if (n_cpus > 0)
-+		return n_cpus;
++	list = g_list_prepend (list, g_strdup ("performance"));
++	list = g_list_prepend (list, g_strdup ("userspace"));
++	list = g_list_prepend (list, g_strdup ("economy"));
 +
-+	len = sizeof (n_cpus);
-+	if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
-+		return 1;
-+	}
-+
-+	return n_cpus;
++	return list;
 +}
-+#else
- guint
- cpufreq_utils_get_n_cpus (void)
- {
-@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
- 	
- 	return 1;
- }
 +#endif /* __FreeBSD__ */
- 
- void
- cpufreq_utils_display_error (const gchar *message,
+--- cpufreq/src/Makefile.in.orig	Mon Mar 12 11:58:09 2007
++++ cpufreq/src/Makefile.in	Mon Mar 12 12:12:06 2007
+@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+ 	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
+ 	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
+ 	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
+-	cpufreq-monitor-cpuinfo.h
++	cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
++	cpufreq-monitor-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
+ @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
+ am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
+@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+ 	cpufreq-monitor-factory.$(OBJEXT) \
+ 	cpufreq-monitor-procfs.$(OBJEXT) \
+ 	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
+-	cpufreq-monitor-cpuinfo.$(OBJEXT)
++	cpufreq-monitor-cpuinfo.$(OBJEXT) \
++	cpufreq-monitor-sysctl.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po \
+@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+ 	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
+ 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
+ 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
++	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
+ 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
+ 	$(cpufreq_files)						\
+ 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
+@@ -496,6 +500,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 8a7ea857c103..8d459fdeef11 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -1,47 +1,3 @@
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Sat Jun 24 01:52:35 2006
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Sat Jun 24 02:14:08 2006
-@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
- 	cpufreq-selector.h cpufreq-selector-sysfs.c \
- 	cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
- 	cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
--	cpufreq-selector-libcpufreq.h main.c
-+	cpufreq-selector-libcpufreq.h main.c \
-+	cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
- @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
- @HAVE_LIBCPUFREQ_TRUE@	cpufreq-selector-libcpufreq.$(OBJEXT)
- am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
- 	cpufreq-selector-sysfs.$(OBJEXT) \
- 	cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
--	main.$(OBJEXT)
-+	main.$(OBJEXT) \
-+	cpufreq-selector-sysctl.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -74,6 +76,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-procfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/main.Po
-@@ -371,6 +374,7 @@ cpufreq_selector_SOURCES = \
- 	cpufreq-selector.c               cpufreq-selector.h        \
- 	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  \
- 	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h \
-+	cpufreq-selector-sysctl.c        cpufreq-selector-sysctl.h \
- 	$(cpufreq_files)					   \
- 	main.c
- 
-@@ -451,6 +455,7 @@ distclean-compile:
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 --- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig	Sat Jun 24 01:52:35 2006
 +++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h	Sat Jun 24 02:13:05 2006
 @@ -0,0 +1,53 @@
@@ -234,3 +190,47 @@
 +
 +	   return TRUE;
 +}
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Mar 12 11:58:09 2007
++++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Mar 12 12:12:33 2007
+@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+ 	cpufreq-selector.h cpufreq-selector-sysfs.c \
+ 	cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
+ 	cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
+-	cpufreq-selector-libcpufreq.h main.c
++	cpufreq-selector-libcpufreq.h main.c \
++	cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
+ @HAVE_LIBCPUFREQ_TRUE@	cpufreq-selector-libcpufreq.$(OBJEXT)
+ am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ 	cpufreq-selector-sysfs.$(OBJEXT) \
+ 	cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
+-	main.$(OBJEXT)
++	main.$(OBJEXT) \
++	cpufreq-selector-sysctl.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-procfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/main.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
+ 	cpufreq-selector.c               cpufreq-selector.h        \
+ 	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  \
+ 	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h \
++	cpufreq-selector-sysctl.c        cpufreq-selector-sysctl.h \
+ 	$(cpufreq_files)					   \
+ 	main.c
+ 
+@@ -466,6 +470,7 @@ distclean-compile:
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 91659e166533..411ee4906704 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,13 +1,6 @@
 %%CPUFREQ%%bin/cpufreq-selector
-bin/gswitchit-plugins-capplet
 %%PYTHON%%bin/invest-chart
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgswitchit/gnome-kbd-indicator.h
-include/libgswitchit/gswitchit-config.h
-include/libgswitchit/gswitchit-plugin.h
-include/libgswitchit/gswitchit-plugins-app.h
-include/libgswitchit/keyboard-config-registry-client.h
-include/libgswitchit/keyboard-config-registry.h
 include/libgweather/gweather-gconf.h
 include/libgweather/gweather-prefs.h
 include/libgweather/weather.h
@@ -59,7 +52,6 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
 libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 libdata/bonobo/servers/GNOME_StickyNotesApplet.server
 %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
-libdata/pkgconfig/gswitchit.pc
 libdata/pkgconfig/gweather.pc
 libexec/accessx-status-applet
 %%BATTERY%%libexec/battstat-applet-2
@@ -78,7 +70,6 @@ libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
-share/gnome/applications/gswitchit-plugins.desktop
 %%PYTHON%%share/gnome/applications/invest-chart.desktop
 share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
 %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
@@ -116,7 +107,6 @@ share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
 %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
 %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
 %%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
-share/gnome/gnome-applets/glade/gswitchit-plugins.glade
 share/gnome/gnome-applets/glade/gswitchit.glade
 %%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
 share/gnome/gnome-applets/glade/modemlights.glade
@@ -153,6 +143,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/en_GB/accessx-status.xml
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/es/accessx-status.xml
 share/gnome/help/accessx-status/es/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png
@@ -238,6 +240,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/en_GB/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/es/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
@@ -250,6 +258,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/pa/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/pa/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
@@ -273,6 +287,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png
 share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/bg/figures/charpick-preferences.png
 share/gnome/help/char-palette/bg/figures/charpick_characters.png
+share/gnome/help/char-palette/en_GB/char-palette.xml
+share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
+share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/en_GB/figures/charpick-preferences.png
+share/gnome/help/char-palette/en_GB/figures/charpick_characters.png
 share/gnome/help/char-palette/es/char-palette.xml
 share/gnome/help/char-palette/es/figures/charpalette_applet.png
 share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
@@ -344,6 +363,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png
@@ -411,6 +440,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/en_GB/drivemount.xml
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/es/drivemount.xml
 share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
@@ -435,6 +470,12 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/ru/drivemount.xml
+share/gnome/help/drivemount/ru/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/sv/drivemount.xml
 share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
@@ -458,6 +499,8 @@ share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/bg/figures/geyes_applet.png
 share/gnome/help/geyes/bg/geyes.xml
+share/gnome/help/geyes/en_GB/figures/geyes_applet.png
+share/gnome/help/geyes/en_GB/geyes.xml
 share/gnome/help/geyes/es/figures/geyes_applet.png
 share/gnome/help/geyes/es/geyes.xml
 share/gnome/help/geyes/fr/figures/geyes_applet.png
@@ -472,8 +515,10 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/geyes.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/en_GB/gswitchit.xml
 share/gnome/help/gswitchit/es/gswitchit.xml
 share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/ru/gswitchit.xml
 share/gnome/help/gswitchit/sv/gswitchit.xml
 share/gnome/help/gswitchit/uk/gswitchit.xml
 share/gnome/help/gweather/C/figures/gweather-details.png
@@ -492,6 +537,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png
 share/gnome/help/gweather/C/figures/stock_weather-sunny.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
+share/gnome/help/gweather/en_GB/figures/gweather-details.png
+share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/en_GB/figures/gweather_applet.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-fog.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-showers.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-snow.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-storm.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-sunny.png
+share/gnome/help/gweather/en_GB/gweather.xml
 share/gnome/help/gweather/es/figures/gweather-details.png
 share/gnome/help/gweather/es/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/es/figures/gweather-prefs-general.png
@@ -537,6 +597,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
 share/gnome/help/gweather/nl/figures/stock_weather-storm.png
 share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
 share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/pa/figures/gweather-details.png
+share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/pa/figures/gweather_applet.png
+share/gnome/help/gweather/pa/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/pa/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-fog.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-showers.png
+share/gnome/help/gweather/pa/figures/stock_weather-snow.png
+share/gnome/help/gweather/pa/figures/stock_weather-storm.png
+share/gnome/help/gweather/pa/figures/stock_weather-sunny.png
+share/gnome/help/gweather/pa/gweather.xml
 share/gnome/help/gweather/sv/figures/gweather-details.png
 share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
@@ -570,12 +645,18 @@ share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/es/mixer_applet2.xml
 share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
 share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ru/mixer_applet2.xml
 share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
 share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
@@ -585,6 +666,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
+share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/en_GB/figures/system_monitor.png
+share/gnome/help/multiload/en_GB/multiload.xml
 share/gnome/help/multiload/es/figures/multiload-preferences.png
 share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/es/figures/system_monitor.png
@@ -593,6 +678,14 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
 share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/fr/figures/system_monitor.png
 share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/pa/figures/multiload-preferences.png
+share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/pa/figures/system_monitor.png
+share/gnome/help/multiload/pa/multiload.xml
+share/gnome/help/multiload/ru/figures/multiload-preferences.png
+share/gnome/help/multiload/ru/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ru/figures/system_monitor.png
+share/gnome/help/multiload/ru/multiload.xml
 share/gnome/help/multiload/sv/figures/multiload-preferences.png
 share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/sv/figures/system_monitor.png
@@ -608,6 +701,12 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/en_GB/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
@@ -620,6 +719,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/pa/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
@@ -635,6 +740,8 @@ share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
 share/gnome/help/trashapplet/C/figures/trash-applet.png
 share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
+share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
+share/gnome/help/trashapplet/en_GB/trashapplet.xml
 share/gnome/help/trashapplet/es/figures/trash-applet.png
 share/gnome/help/trashapplet/es/trashapplet.xml
 share/gnome/help/trashapplet/fr/figures/trash-applet.png
@@ -653,6 +760,7 @@ share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/trashapplet.xml
 share/gnome/omf/accessx-status/accessx-status-C.omf
 share/gnome/omf/accessx-status/accessx-status-bg.omf
+share/gnome/omf/accessx-status/accessx-status-en_GB.omf
 share/gnome/omf/accessx-status/accessx-status-es.omf
 share/gnome/omf/accessx-status/accessx-status-fr.omf
 share/gnome/omf/accessx-status/accessx-status-it.omf
@@ -661,12 +769,15 @@ share/gnome/omf/accessx-status/accessx-status-sv.omf
 share/gnome/omf/accessx-status/accessx-status-uk.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-en_GB.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-pa.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
 share/gnome/omf/char-palette/char-palette-C.omf
 share/gnome/omf/char-palette/char-palette-bg.omf
+share/gnome/omf/char-palette/char-palette-en_GB.omf
 share/gnome/omf/char-palette/char-palette-es.omf
 share/gnome/omf/char-palette/char-palette-fr.omf
 share/gnome/omf/char-palette/char-palette-it.omf
@@ -681,6 +792,7 @@ share/gnome/omf/char-palette/char-palette-uk.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
@@ -688,15 +800,18 @@ share/gnome/omf/char-palette/char-palette-uk.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
 share/gnome/omf/drivemount/drivemount-C.omf
+share/gnome/omf/drivemount/drivemount-en_GB.omf
 share/gnome/omf/drivemount/drivemount-es.omf
 share/gnome/omf/drivemount/drivemount-fr.omf
 share/gnome/omf/drivemount/drivemount-it.omf
 share/gnome/omf/drivemount/drivemount-pa.omf
+share/gnome/omf/drivemount/drivemount-ru.omf
 share/gnome/omf/drivemount/drivemount-sv.omf
 share/gnome/omf/drivemount/drivemount-uk.omf
 share/gnome/omf/drivemount/drivemount-zh_CN.omf
 share/gnome/omf/geyes/geyes-C.omf
 share/gnome/omf/geyes/geyes-bg.omf
+share/gnome/omf/geyes/geyes-en_GB.omf
 share/gnome/omf/geyes/geyes-es.omf
 share/gnome/omf/geyes/geyes-fr.omf
 share/gnome/omf/geyes/geyes-it.omf
@@ -704,33 +819,46 @@ share/gnome/omf/geyes/geyes-ru.omf
 share/gnome/omf/geyes/geyes-sv.omf
 share/gnome/omf/geyes/geyes-uk.omf
 share/gnome/omf/gswitchit/gswitchit-C.omf
+share/gnome/omf/gswitchit/gswitchit-en_GB.omf
 share/gnome/omf/gswitchit/gswitchit-es.omf
 share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-ru.omf
 share/gnome/omf/gswitchit/gswitchit-sv.omf
 share/gnome/omf/gswitchit/gswitchit-uk.omf
 share/gnome/omf/gweather/gweather-C.omf
+share/gnome/omf/gweather/gweather-en_GB.omf
 share/gnome/omf/gweather/gweather-es.omf
 share/gnome/omf/gweather/gweather-fr.omf
 share/gnome/omf/gweather/gweather-nl.omf
+share/gnome/omf/gweather/gweather-pa.omf
 share/gnome/omf/gweather/gweather-sv.omf
 share/gnome/omf/gweather/gweather-uk.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-en_GB.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-it.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-pa.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-ru.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
 share/gnome/omf/multiload/multiload-C.omf
+share/gnome/omf/multiload/multiload-en_GB.omf
 share/gnome/omf/multiload/multiload-es.omf
 share/gnome/omf/multiload/multiload-fr.omf
+share/gnome/omf/multiload/multiload-pa.omf
+share/gnome/omf/multiload/multiload-ru.omf
 share/gnome/omf/multiload/multiload-sv.omf
 share/gnome/omf/multiload/multiload-uk.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-pa.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/gnome/omf/trashapplet/trashapplet-C.omf
+share/gnome/omf/trashapplet/trashapplet-en_GB.omf
 share/gnome/omf/trashapplet/trashapplet-es.omf
 share/gnome/omf/trashapplet/trashapplet-fr.omf
 share/gnome/omf/trashapplet/trashapplet-it.omf
@@ -1028,6 +1156,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/trashapplet/fr
 @dirrm share/gnome/help/trashapplet/es/figures
 @dirrm share/gnome/help/trashapplet/es
+@dirrm share/gnome/help/trashapplet/en_GB/figures
+@dirrm share/gnome/help/trashapplet/en_GB
 @dirrm share/gnome/help/trashapplet/C/figures
 @dirrm share/gnome/help/trashapplet/C
 @dirrm share/gnome/help/trashapplet
@@ -1035,10 +1165,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/stickynotes_applet/uk
 @dirrm share/gnome/help/stickynotes_applet/sv/figures
 @dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/pa/figures
+@dirrm share/gnome/help/stickynotes_applet/pa
 @dirrm share/gnome/help/stickynotes_applet/fr/figures
 @dirrm share/gnome/help/stickynotes_applet/fr
 @dirrm share/gnome/help/stickynotes_applet/es/figures
 @dirrm share/gnome/help/stickynotes_applet/es
+@dirrm share/gnome/help/stickynotes_applet/en_GB/figures
+@dirrm share/gnome/help/stickynotes_applet/en_GB
 @dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
@@ -1046,10 +1180,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/sv/figures
 @dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ru/figures
+@dirrm share/gnome/help/multiload/ru
+@dirrm share/gnome/help/multiload/pa/figures
+@dirrm share/gnome/help/multiload/pa
 @dirrm share/gnome/help/multiload/fr/figures
 @dirrm share/gnome/help/multiload/fr
 @dirrm share/gnome/help/multiload/es/figures
 @dirrm share/gnome/help/multiload/es
+@dirrm share/gnome/help/multiload/en_GB/figures
+@dirrm share/gnome/help/multiload/en_GB
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
@@ -1057,12 +1197,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/mixer_applet2/uk
 @dirrm share/gnome/help/mixer_applet2/sv/figures
 @dirrm share/gnome/help/mixer_applet2/sv
+@dirrm share/gnome/help/mixer_applet2/ru/figures
+@dirrm share/gnome/help/mixer_applet2/ru
+@dirrm share/gnome/help/mixer_applet2/pa/figures
+@dirrm share/gnome/help/mixer_applet2/pa
 @dirrm share/gnome/help/mixer_applet2/it/figures
 @dirrm share/gnome/help/mixer_applet2/it
 @dirrm share/gnome/help/mixer_applet2/fr/figures
 @dirrm share/gnome/help/mixer_applet2/fr
 @dirrm share/gnome/help/mixer_applet2/es/figures
 @dirrm share/gnome/help/mixer_applet2/es
+@dirrm share/gnome/help/mixer_applet2/en_GB/figures
+@dirrm share/gnome/help/mixer_applet2/en_GB
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
@@ -1070,19 +1216,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gweather/uk
 @dirrm share/gnome/help/gweather/sv/figures
 @dirrm share/gnome/help/gweather/sv
+@dirrm share/gnome/help/gweather/pa/figures
+@dirrm share/gnome/help/gweather/pa
 @dirrm share/gnome/help/gweather/nl/figures
 @dirrm share/gnome/help/gweather/nl
 @dirrm share/gnome/help/gweather/fr/figures
 @dirrm share/gnome/help/gweather/fr
 @dirrm share/gnome/help/gweather/es/figures
 @dirrm share/gnome/help/gweather/es
+@dirrm share/gnome/help/gweather/en_GB/figures
+@dirrm share/gnome/help/gweather/en_GB
 @dirrm share/gnome/help/gweather/C/figures
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
 @dirrm share/gnome/help/gswitchit/uk
 @dirrm share/gnome/help/gswitchit/sv
+@dirrm share/gnome/help/gswitchit/ru
 @dirrm share/gnome/help/gswitchit/fr
 @dirrm share/gnome/help/gswitchit/es
+@dirrm share/gnome/help/gswitchit/en_GB
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
@@ -1097,6 +1249,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/geyes/fr
 @dirrm share/gnome/help/geyes/es/figures
 @dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/en_GB/figures
+@dirrm share/gnome/help/geyes/en_GB
 @dirrm share/gnome/help/geyes/bg/figures
 @dirrm share/gnome/help/geyes/bg
 @dirrm share/gnome/help/geyes/C/figures
@@ -1108,6 +1262,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/drivemount/uk
 @dirrm share/gnome/help/drivemount/sv/figures
 @dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ru/figures
+@dirrm share/gnome/help/drivemount/ru
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
 @dirrm share/gnome/help/drivemount/it/figures
@@ -1116,6 +1272,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/drivemount/fr
 @dirrm share/gnome/help/drivemount/es/figures
 @dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/en_GB/figures
+@dirrm share/gnome/help/drivemount/en_GB
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
@@ -1131,6 +1289,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
@@ -1161,6 +1321,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/char-palette/fr
 @dirrm share/gnome/help/char-palette/es/figures
 @dirrm share/gnome/help/char-palette/es
+@dirrm share/gnome/help/char-palette/en_GB/figures
+@dirrm share/gnome/help/char-palette/en_GB
 @dirrm share/gnome/help/char-palette/bg/figures
 @dirrm share/gnome/help/char-palette/bg
 @dirrm share/gnome/help/char-palette/C/figures
@@ -1170,10 +1332,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%BATTERY%%@dirrm share/gnome/help/battstat/uk
 %%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/sv
+%%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/pa
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr
 %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/es
+%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB
 %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/bg
 %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
@@ -1191,6 +1357,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status/fr
 @dirrm share/gnome/help/accessx-status/es/figures
 @dirrm share/gnome/help/accessx-status/es
+@dirrm share/gnome/help/accessx-status/en_GB/figures
+@dirrm share/gnome/help/accessx-status/en_GB
 @dirrm share/gnome/help/accessx-status/bg/figures
 @dirrm share/gnome/help/accessx-status/bg
 @dirrm share/gnome/help/accessx-status/C/figures
@@ -1209,7 +1377,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/gnome-applets
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
 @dirrm include/libgweather
-@dirrm include/libgswitchit
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES