Update to 2.11.93.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4664 df743ca5-7f9a-e211-a948-0013205c9059

16 files changed, 258 insertions, 228 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index f5f8a4148..45d44c22a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.89 2005/08/24 01:13:06 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.90 2005/08/24 02:20:43 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.11.92.1
+PORTVERSION=	2.11.93
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index fd8fd19de..c2c90372f 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.11.92.1.tar.bz2) = 035684af82060eb19af881d70a822478
-SIZE (gnome2/gnome-applets-2.11.92.1.tar.bz2) = 3786672
+MD5 (gnome2/gnome-applets-2.11.93.tar.bz2) = e83fe1dd0f36a7d5ec61b6ca966e7aba
+SIZE (gnome2/gnome-applets-2.11.93.tar.bz2) = 3887803
diff --git a/x11/gnome-applets/files/patch-battstat_power-management.c b/x11/gnome-applets/files/patch-battstat_power-management.c
index 8254969f8..9cea2d65b 100644
--- a/x11/gnome-applets/files/patch-battstat_power-management.c
+++ b/x11/gnome-applets/files/patch-battstat_power-management.c
@@ -1,6 +1,17 @@
---- battstat/power-management.c.orig	Mon Jul  4 09:41:04 2005
-+++ battstat/power-management.c	Sat Jul 16 21:17:05 2005
-@@ -173,16 +173,40 @@ apm_readinfo (BatteryStatus *status)
+--- battstat/power-management.c.orig	Thu Aug 25 23:45:47 2005
++++ battstat/power-management.c	Tue Aug 30 01:28:40 2005
+@@ -61,9 +61,7 @@
+ 
+ static const char *apm_readinfo (BatteryStatus *status);
+ static int pm_initialised;
+-#ifdef HAVE_HAL
+-static int using_hal;
+-#endif
++static int using_hal = FALSE;
+ 
+ /*
+  * What follows is a series of platform-specific apm_readinfo functions
+@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status)
  
  #elif __FreeBSD__
  
@@ -41,7 +52,7 @@
  static const char *
  apm_readinfo (BatteryStatus *status)
  {
-@@ -190,21 +214,27 @@ apm_readinfo (BatteryStatus *status)
+@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status)
  
    if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
  
@@ -77,7 +88,7 @@
      fd = open(APMDEVICE, O_RDONLY);
      if (fd == -1) {
        return ERR_OPEN_APMDEV;
-@@ -217,6 +247,9 @@ apm_readinfo (BatteryStatus *status)
+@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status)
  
      if(apminfo.ai_status == 0)
        return ERR_APM_E;
@@ -87,7 +98,7 @@
    }
  
    status->present = TRUE;
-@@ -476,6 +509,12 @@ power_management_initialise( void )
+@@ -480,6 +511,12 @@ power_management_initialise( int no_hal 
    }
    else
      using_acpi = FALSE;
@@ -100,7 +111,7 @@
  #endif
    pm_initialised = 1;
  
-@@ -509,6 +548,9 @@ power_management_cleanup( void )
+@@ -513,6 +550,9 @@ power_management_cleanup( void )
    }
  #elif defined(__FreeBSD__)
    if (using_acpi) {
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 1037fd8f9..530950e6a 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -1,37 +1,3 @@
---- cpufreq/src/Makefile.in.orig	Sun Feb 13 01:00:35 2005
-+++ cpufreq/src/Makefile.in	Sun Feb 13 01:01:31 2005
-@@ -55,6 +55,7 @@
- 	cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
- 	cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
- 	cpufreq-monitor-procfs.$(OBJEXT) \
-+	cpufreq-monitor-sysctl.$(OBJEXT) \
- 	cpufreq-monitor-sysfs.$(OBJEXT) \
- 	cpufreq-monitor-cpuinfo.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
-@@ -68,6 +69,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-factory.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
-@@ -336,6 +338,7 @@
- 					cpufreq-monitor-protected.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-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
- 
-@@ -419,6 +422,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.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	Sun Feb 13 01:00:25 2005
 +++ cpufreq/src/cpufreq-monitor-sysctl.h	Sat Feb 12 20:25:21 2005
 @@ -0,0 +1,48 @@
@@ -526,3 +492,29 @@
  
          if (mcpu >= 0)
                  return mcpu;
+--- cpufreq/src/Makefile.in.orig	Tue Aug 30 01:14:03 2005
++++ cpufreq/src/Makefile.in	Tue Aug 30 01:14:03 2005
+@@ -58,6 +58,7 @@
+ 	cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
+ 	cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
+ 	cpufreq-monitor-procfs.$(OBJEXT) \
++	cpufreq-monitor-sysctl.$(OBJEXT) \
+ 	cpufreq-monitor-sysfs.$(OBJEXT) \
+ 	cpufreq-monitor-cpuinfo.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+@@ -353,6 +354,7 @@
+ 					cpufreq-monitor-protected.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-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
+ 
+@@ -436,6 +438,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.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 8932c975a..15ad4aac0 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -1,38 +1,3 @@
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Feb 14 00:26:10 2005
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Feb 14 00:26:58 2005
-@@ -53,7 +53,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
- 	cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
--	main.$(OBJEXT)
-+	cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -61,6 +61,7 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -310,6 +311,7 @@
- 	cpufreq.c               cpufreq.h        \
- 	cpufreq-sysfs.c         cpufreq-sysfs.h  \
- 	cpufreq-procfs.c        cpufreq-procfs.h \
-+	cpufreq-sysctl.c        cpufreq-sysctl.h \
- 	main.c
- 
- cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
-@@ -385,6 +387,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig	Mon Feb 14 00:38:57 2005
 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h	Mon Feb 14 00:21:39 2005
 @@ -0,0 +1,51 @@
@@ -371,3 +336,30 @@
          } else {
                  g_print ("No cpufreq support\n");
                  return 1;
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Tue Aug 30 01:16:37 2005
++++ cpufreq/src/cpufreq-selector/Makefile.in	Tue Aug 30 01:16:37 2005
+@@ -56,7 +56,7 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
+ 	cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
+-	main.$(OBJEXT)
++	cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@@ -332,6 +332,7 @@
+ 	cpufreq.c               cpufreq.h        \
+ 	cpufreq-sysfs.c         cpufreq-sysfs.h  \
+ 	cpufreq-procfs.c        cpufreq-procfs.h \
++	cpufreq-sysctl.c        cpufreq-sysctl.h \
+ 	main.c
+ 
+ cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
+@@ -407,6 +408,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-gweather_weather.c b/x11/gnome-applets/files/patch-gweather_weather.c
deleted file mode 100644
index cdc1921ab..000000000
--- a/x11/gnome-applets/files/patch-gweather_weather.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gweather/weather.c.orig	Tue Mar  1 04:34:33 2005
-+++ gweather/weather.c	Tue Mar  1 12:36:54 2005
-@@ -20,7 +20,9 @@
- #include <string.h>
- #include <ctype.h>
- #include <math.h>
-+#ifndef __FreeBSD__
- #include <values.h>
-+#endif
- 
- #ifdef __FreeBSD__
- #include <sys/types.h>
diff --git a/x11/gnome-applets/files/patch-modemlights_modem-applet.c b/x11/gnome-applets/files/patch-modemlights_modem-applet.c
deleted file mode 100644
index f4fb13717..000000000
--- a/x11/gnome-applets/files/patch-modemlights_modem-applet.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- modemlights/modem-applet.c.orig	Fri Jan 14 00:06:52 2005
-+++ modemlights/modem-applet.c	Fri Jan 14 00:08:28 2005
-@@ -24,12 +24,19 @@
- 
- #include <panel-applet.h>
- #include <fcntl.h>
-+#ifndef __FreeBSD__
- #include <pty.h>
-+#endif
- #include <sys/poll.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <libxml/tree.h>
- #include <glade/glade.h>
-+#ifdef __FreeBSD__
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
-+#endif
- 
- #include "modem-applet.h"
- 
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 09b7cc14d..f428bf5ce 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -83,75 +83,111 @@ share/gnome/gnome-applets/gweather/locations.dtd
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/legal.xml
 share/gnome/help/accessx-status/es/accessx-status.xml
+share/gnome/help/accessx-status/fr/accessx-status.xml
+share/gnome/help/accessx-status/uk/accessx-status.xml
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/uk/battstat.xml
 share/gnome/help/char-palette/C/char-palette.xml
 share/gnome/help/char-palette/C/legal.xml
 share/gnome/help/char-palette/es/char-palette.xml
 share/gnome/help/char-palette/nl/char-palette.xml
+share/gnome/help/char-palette/uk/char-palette.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/legal.xml
 share/gnome/help/command-line/es/command-line.xml
+share/gnome/help/command-line/uk/command-line.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
 share/gnome/help/drivemount/C/drivemount.xml
 share/gnome/help/drivemount/C/legal.xml
 share/gnome/help/drivemount/es/drivemount.xml
+share/gnome/help/drivemount/uk/drivemount.xml
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/es/geyes.xml
+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/es/gswitchit.xml
+share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/uk/gswitchit.xml
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
 share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
 share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/uk/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
 share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
 share/gnome/help/trashapplet/es/trashapplet.xml
+share/gnome/help/trashapplet/fr/trashapplet.xml
 share/gnome/help/trashapplet/pa/trashapplet.xml
+share/gnome/help/trashapplet/uk/trashapplet.xml
 share/gnome/omf/accessx-status/accessx-status-C.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-uk.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-es.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-es.omf
 share/gnome/omf/char-palette/char-palette-nl.omf
+share/gnome/omf/char-palette/char-palette-uk.omf
 share/gnome/omf/command-line/command-line-C.omf
 share/gnome/omf/command-line/command-line-es.omf
+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-es.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
 share/gnome/omf/drivemount/drivemount-C.omf
 share/gnome/omf/drivemount/drivemount-es.omf
+share/gnome/omf/drivemount/drivemount-uk.omf
 share/gnome/omf/geyes/geyes-C.omf
 share/gnome/omf/geyes/geyes-es.omf
+share/gnome/omf/geyes/geyes-uk.omf
 share/gnome/omf/gswitchit/gswitchit-C.omf
 share/gnome/omf/gswitchit/gswitchit-es.omf
+share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-uk.omf
 share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
 share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
+share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf
 share/gnome/omf/gweather/gweather-C.omf
 share/gnome/omf/gweather/gweather-es.omf
+share/gnome/omf/gweather/gweather-uk.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
 share/gnome/omf/multiload/multiload-C.omf
 share/gnome/omf/multiload/multiload-es.omf
+share/gnome/omf/multiload/multiload-uk.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/gnome/omf/trashapplet/trashapplet-C.omf
 share/gnome/omf/trashapplet/trashapplet-es.omf
+share/gnome/omf/trashapplet/trashapplet-fr.omf
 share/gnome/omf/trashapplet/trashapplet-pa.omf
+share/gnome/omf/trashapplet/trashapplet-uk.omf
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
 share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@@ -390,46 +426,64 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/omf/char-palette
 %%BATTERY%%@dirrm share/gnome/omf/battstat
 @dirrm share/gnome/omf/accessx-status
+@dirrm share/gnome/help/trashapplet/uk
 @dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/fr
 @dirrm share/gnome/help/trashapplet/es
 @dirrm share/gnome/help/trashapplet/C
 @dirrm share/gnome/help/trashapplet
+@dirrm share/gnome/help/stickynotes_applet/uk
 @dirrm share/gnome/help/stickynotes_applet/es
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/es
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
+@dirrm share/gnome/help/mixer_applet2/uk
 @dirrm share/gnome/help/mixer_applet2/es
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/uk
 @dirrm share/gnome/help/gweather/es
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/uk
 @dirrm share/gnome/help/gtik2_applet2/es
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/uk
+@dirrm share/gnome/help/gswitchit/fr
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
+@dirrm share/gnome/help/geyes/uk
 @dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/uk
 @dirrm share/gnome/help/drivemount/es
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
+@dirrm share/gnome/help/command-line/uk
 @dirrm share/gnome/help/command-line/es
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
+@dirrm share/gnome/help/char-palette/uk
 @dirrm share/gnome/help/char-palette/nl
 @dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
+%%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/es
 %%BATTERY%%@dirrm share/gnome/help/battstat/C
 %%BATTERY%%@dirrm share/gnome/help/battstat
+@dirrm share/gnome/help/accessx-status/uk
+@dirrm share/gnome/help/accessx-status/fr
 @dirrm share/gnome/help/accessx-status/es
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index f5f8a4148..45d44c22a 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.89 2005/08/24 01:13:06 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.90 2005/08/24 02:20:43 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.11.92.1
+PORTVERSION=	2.11.93
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index fd8fd19de..c2c90372f 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.11.92.1.tar.bz2) = 035684af82060eb19af881d70a822478
-SIZE (gnome2/gnome-applets-2.11.92.1.tar.bz2) = 3786672
+MD5 (gnome2/gnome-applets-2.11.93.tar.bz2) = e83fe1dd0f36a7d5ec61b6ca966e7aba
+SIZE (gnome2/gnome-applets-2.11.93.tar.bz2) = 3887803
diff --git a/x11/gnomeapplets2/files/patch-battstat_power-management.c b/x11/gnomeapplets2/files/patch-battstat_power-management.c
index 8254969f8..9cea2d65b 100644
--- a/x11/gnomeapplets2/files/patch-battstat_power-management.c
+++ b/x11/gnomeapplets2/files/patch-battstat_power-management.c
@@ -1,6 +1,17 @@
---- battstat/power-management.c.orig	Mon Jul  4 09:41:04 2005
-+++ battstat/power-management.c	Sat Jul 16 21:17:05 2005
-@@ -173,16 +173,40 @@ apm_readinfo (BatteryStatus *status)
+--- battstat/power-management.c.orig	Thu Aug 25 23:45:47 2005
++++ battstat/power-management.c	Tue Aug 30 01:28:40 2005
+@@ -61,9 +61,7 @@
+ 
+ static const char *apm_readinfo (BatteryStatus *status);
+ static int pm_initialised;
+-#ifdef HAVE_HAL
+-static int using_hal;
+-#endif
++static int using_hal = FALSE;
+ 
+ /*
+  * What follows is a series of platform-specific apm_readinfo functions
+@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status)
  
  #elif __FreeBSD__
  
@@ -41,7 +52,7 @@
  static const char *
  apm_readinfo (BatteryStatus *status)
  {
-@@ -190,21 +214,27 @@ apm_readinfo (BatteryStatus *status)
+@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status)
  
    if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
  
@@ -77,7 +88,7 @@
      fd = open(APMDEVICE, O_RDONLY);
      if (fd == -1) {
        return ERR_OPEN_APMDEV;
-@@ -217,6 +247,9 @@ apm_readinfo (BatteryStatus *status)
+@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status)
  
      if(apminfo.ai_status == 0)
        return ERR_APM_E;
@@ -87,7 +98,7 @@
    }
  
    status->present = TRUE;
-@@ -476,6 +509,12 @@ power_management_initialise( void )
+@@ -480,6 +511,12 @@ power_management_initialise( int no_hal 
    }
    else
      using_acpi = FALSE;
@@ -100,7 +111,7 @@
  #endif
    pm_initialised = 1;
  
-@@ -509,6 +548,9 @@ power_management_cleanup( void )
+@@ -513,6 +550,9 @@ power_management_cleanup( void )
    }
  #elif defined(__FreeBSD__)
    if (using_acpi) {
diff --git a/x11/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd
index 1037fd8f9..530950e6a 100644
--- a/x11/gnomeapplets2/files/patch-cpufreq-freebsd
+++ b/x11/gnomeapplets2/files/patch-cpufreq-freebsd
@@ -1,37 +1,3 @@
---- cpufreq/src/Makefile.in.orig	Sun Feb 13 01:00:35 2005
-+++ cpufreq/src/Makefile.in	Sun Feb 13 01:01:31 2005
-@@ -55,6 +55,7 @@
- 	cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
- 	cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
- 	cpufreq-monitor-procfs.$(OBJEXT) \
-+	cpufreq-monitor-sysctl.$(OBJEXT) \
- 	cpufreq-monitor-sysfs.$(OBJEXT) \
- 	cpufreq-monitor-cpuinfo.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
-@@ -68,6 +69,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-factory.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
-@@ -336,6 +338,7 @@
- 					cpufreq-monitor-protected.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-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
- 
-@@ -419,6 +422,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.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	Sun Feb 13 01:00:25 2005
 +++ cpufreq/src/cpufreq-monitor-sysctl.h	Sat Feb 12 20:25:21 2005
 @@ -0,0 +1,48 @@
@@ -526,3 +492,29 @@
  
          if (mcpu >= 0)
                  return mcpu;
+--- cpufreq/src/Makefile.in.orig	Tue Aug 30 01:14:03 2005
++++ cpufreq/src/Makefile.in	Tue Aug 30 01:14:03 2005
+@@ -58,6 +58,7 @@
+ 	cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
+ 	cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
+ 	cpufreq-monitor-procfs.$(OBJEXT) \
++	cpufreq-monitor-sysctl.$(OBJEXT) \
+ 	cpufreq-monitor-sysfs.$(OBJEXT) \
+ 	cpufreq-monitor-cpuinfo.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+@@ -353,6 +354,7 @@
+ 					cpufreq-monitor-protected.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-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
+ 
+@@ -436,6 +438,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.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/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
index 8932c975a..15ad4aac0 100644
--- a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
@@ -1,38 +1,3 @@
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Feb 14 00:26:10 2005
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Feb 14 00:26:58 2005
-@@ -53,7 +53,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
- 	cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
--	main.$(OBJEXT)
-+	cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -61,6 +61,7 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -310,6 +311,7 @@
- 	cpufreq.c               cpufreq.h        \
- 	cpufreq-sysfs.c         cpufreq-sysfs.h  \
- 	cpufreq-procfs.c        cpufreq-procfs.h \
-+	cpufreq-sysctl.c        cpufreq-sysctl.h \
- 	main.c
- 
- cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
-@@ -385,6 +387,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig	Mon Feb 14 00:38:57 2005
 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h	Mon Feb 14 00:21:39 2005
 @@ -0,0 +1,51 @@
@@ -371,3 +336,30 @@
          } else {
                  g_print ("No cpufreq support\n");
                  return 1;
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Tue Aug 30 01:16:37 2005
++++ cpufreq/src/cpufreq-selector/Makefile.in	Tue Aug 30 01:16:37 2005
+@@ -56,7 +56,7 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
+ 	cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
+-	main.$(OBJEXT)
++	cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@@ -332,6 +332,7 @@
+ 	cpufreq.c               cpufreq.h        \
+ 	cpufreq-sysfs.c         cpufreq-sysfs.h  \
+ 	cpufreq-procfs.c        cpufreq-procfs.h \
++	cpufreq-sysctl.c        cpufreq-sysctl.h \
+ 	main.c
+ 
+ cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
+@@ -407,6 +408,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c
deleted file mode 100644
index cdc1921ab..000000000
--- a/x11/gnomeapplets2/files/patch-gweather_weather.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gweather/weather.c.orig	Tue Mar  1 04:34:33 2005
-+++ gweather/weather.c	Tue Mar  1 12:36:54 2005
-@@ -20,7 +20,9 @@
- #include <string.h>
- #include <ctype.h>
- #include <math.h>
-+#ifndef __FreeBSD__
- #include <values.h>
-+#endif
- 
- #ifdef __FreeBSD__
- #include <sys/types.h>
diff --git a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c
deleted file mode 100644
index f4fb13717..000000000
--- a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- modemlights/modem-applet.c.orig	Fri Jan 14 00:06:52 2005
-+++ modemlights/modem-applet.c	Fri Jan 14 00:08:28 2005
-@@ -24,12 +24,19 @@
- 
- #include <panel-applet.h>
- #include <fcntl.h>
-+#ifndef __FreeBSD__
- #include <pty.h>
-+#endif
- #include <sys/poll.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <libxml/tree.h>
- #include <glade/glade.h>
-+#ifdef __FreeBSD__
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
-+#endif
- 
- #include "modem-applet.h"
- 
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 09b7cc14d..f428bf5ce 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -83,75 +83,111 @@ share/gnome/gnome-applets/gweather/locations.dtd
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/legal.xml
 share/gnome/help/accessx-status/es/accessx-status.xml
+share/gnome/help/accessx-status/fr/accessx-status.xml
+share/gnome/help/accessx-status/uk/accessx-status.xml
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/uk/battstat.xml
 share/gnome/help/char-palette/C/char-palette.xml
 share/gnome/help/char-palette/C/legal.xml
 share/gnome/help/char-palette/es/char-palette.xml
 share/gnome/help/char-palette/nl/char-palette.xml
+share/gnome/help/char-palette/uk/char-palette.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/legal.xml
 share/gnome/help/command-line/es/command-line.xml
+share/gnome/help/command-line/uk/command-line.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
 share/gnome/help/drivemount/C/drivemount.xml
 share/gnome/help/drivemount/C/legal.xml
 share/gnome/help/drivemount/es/drivemount.xml
+share/gnome/help/drivemount/uk/drivemount.xml
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/es/geyes.xml
+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/es/gswitchit.xml
+share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/uk/gswitchit.xml
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
 share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
 share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/uk/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
 share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
 share/gnome/help/trashapplet/es/trashapplet.xml
+share/gnome/help/trashapplet/fr/trashapplet.xml
 share/gnome/help/trashapplet/pa/trashapplet.xml
+share/gnome/help/trashapplet/uk/trashapplet.xml
 share/gnome/omf/accessx-status/accessx-status-C.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-uk.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-es.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-es.omf
 share/gnome/omf/char-palette/char-palette-nl.omf
+share/gnome/omf/char-palette/char-palette-uk.omf
 share/gnome/omf/command-line/command-line-C.omf
 share/gnome/omf/command-line/command-line-es.omf
+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-es.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
 share/gnome/omf/drivemount/drivemount-C.omf
 share/gnome/omf/drivemount/drivemount-es.omf
+share/gnome/omf/drivemount/drivemount-uk.omf
 share/gnome/omf/geyes/geyes-C.omf
 share/gnome/omf/geyes/geyes-es.omf
+share/gnome/omf/geyes/geyes-uk.omf
 share/gnome/omf/gswitchit/gswitchit-C.omf
 share/gnome/omf/gswitchit/gswitchit-es.omf
+share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-uk.omf
 share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
 share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
+share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf
 share/gnome/omf/gweather/gweather-C.omf
 share/gnome/omf/gweather/gweather-es.omf
+share/gnome/omf/gweather/gweather-uk.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
 share/gnome/omf/multiload/multiload-C.omf
 share/gnome/omf/multiload/multiload-es.omf
+share/gnome/omf/multiload/multiload-uk.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/gnome/omf/trashapplet/trashapplet-C.omf
 share/gnome/omf/trashapplet/trashapplet-es.omf
+share/gnome/omf/trashapplet/trashapplet-fr.omf
 share/gnome/omf/trashapplet/trashapplet-pa.omf
+share/gnome/omf/trashapplet/trashapplet-uk.omf
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
 share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@@ -390,46 +426,64 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/omf/char-palette
 %%BATTERY%%@dirrm share/gnome/omf/battstat
 @dirrm share/gnome/omf/accessx-status
+@dirrm share/gnome/help/trashapplet/uk
 @dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/fr
 @dirrm share/gnome/help/trashapplet/es
 @dirrm share/gnome/help/trashapplet/C
 @dirrm share/gnome/help/trashapplet
+@dirrm share/gnome/help/stickynotes_applet/uk
 @dirrm share/gnome/help/stickynotes_applet/es
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/es
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
+@dirrm share/gnome/help/mixer_applet2/uk
 @dirrm share/gnome/help/mixer_applet2/es
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/uk
 @dirrm share/gnome/help/gweather/es
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/uk
 @dirrm share/gnome/help/gtik2_applet2/es
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/uk
+@dirrm share/gnome/help/gswitchit/fr
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
+@dirrm share/gnome/help/geyes/uk
 @dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/uk
 @dirrm share/gnome/help/drivemount/es
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
+@dirrm share/gnome/help/command-line/uk
 @dirrm share/gnome/help/command-line/es
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
+@dirrm share/gnome/help/char-palette/uk
 @dirrm share/gnome/help/char-palette/nl
 @dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
+%%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/es
 %%BATTERY%%@dirrm share/gnome/help/battstat/C
 %%BATTERY%%@dirrm share/gnome/help/battstat
+@dirrm share/gnome/help/accessx-status/uk
+@dirrm share/gnome/help/accessx-status/fr
 @dirrm share/gnome/help/accessx-status/es
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status