Update to 2.6.0. Changes since previous stable branch (2.4.x):

Changes in GNOME-Applets 2.5.90
===============================

Overall
* Major docs updates and cleanups. (Glynn Foster, SUN Microsystems doc team)
* Build tree cleanups. (Glynn Foster)

Translations
* Brazilian (Raphael Higino)
* Russian (Leonid Kanter)
* Bengali (Sayamindu Dasgupta)
* Dutch (Elros Cyriatan)

Changes in GNOME-Applets 2.5.8
==============================
Needs to be updated.

Changes in GNOME-Applets 2.5.7
==============================
Needs to be updated.

Changes in GNOME-Applets 2.5.6
==============================

Overall
* Docs updates (Breda McColgan)
* BSD fixes - bug #134654 (Julio M. Merino Vidal)
* Fix disable-schemas_install (Jason Leach)
* Fix cleaning up .servin.in files - bug #132071 (Jason, Padraig O'Briain)
* Depracation fixes (Kjartan Maraas)
* Fix compilation - bug #133213 (Alexander Winston)
* Add documentor credits (Chee Bin Hoh)

Battery Charge Monitor
* BSD fixes - bug #134661 (Julio M. Merino Vidal)

CD Player
* BSD fixes - bug #134657 (Julio M. Merino Vidal)
* Reduce cpu useage with accesability on - bug #133619 (Pardraig O'Briain)

Character Palette
* Multihead fix - bug #133587 (Dennis)

Disk Mounter
* multihead fixes - bug #134019 (Dennis Smit)

Geyes
* Allow for user installed themes in home directory - bug #122872 (Dennis)
* properly install themes - bug #133100 (Chee Bin Hoh)

GKB
* Keypress fixes - bug #101960 (Egmont Koblinger)

GSwitchit
* Multihead awareness - bug #134025 (Dennis Smit)
* HIG fixes - bugs #133701, 133702, 133570 (Dennis Cranston)
* Fix keynav - bug #132851 (Padraig)

Inbox Monitor
* Fix auto updateing - bug #131407 (Srinivasa Ragavan)
* Gettext fixes - bug #134398 (Gustavo)
* Fix multihead issues - bug #111837 (Leena Gunda)

Keyboard Assesibility
* Fix bug #124153 (Kjartan Maraas)
* mark strings for translation - bug #132579 (Kjartan)

Modem Lights
* Multihead fixes (Dennis)

Stickynotes
* Gconf snaity checks - bug #124024 (Kevin Vandersloot)
* Fix initial placement of notes - bug #125675 (Kevin)
* Multihead fixes - bug #128258 (Dennis, Leena Gunda )

Stock Ticker
* Fix compilation (Jody Goldberg)
* Fix data retrieval - bug #123125  Remi Cohen-Scali.

System Monitor
* install and fix docs - bug #87496 (Dennis, Alexander Winston)

Volume Control
* Fix hadow type - bug #133136 (Richard Hult)

Weather Monitor
* Fix help - bug #134826 (Vijaykumar Patwari)
* More Swedish locations - bug 134479 (Andre Dahlgvist)
* Add Ukraine locations - bug #126101 (Yury Umanets)
* Fix wind display direction - bug #132230 (corwashere yahoo com)
* Divide areas into regions, states, cities etc - bug #81391 (Michael Terry)

Translations
* Albanian (Elian Myftiu)
* Arabic (Arafat Medini)
* Canadian English (Adam Weinberger)
* Croation (Robert Sedak)
* Czech (Miloslav Trmac)
* Danish (Ole Laursen)
* Dutch (Vincent van Adrighem)
* Finnish (Jarkko Ranta)
* French (Christophe Merlet)
* German (Christian Neumair)
* Greek (Kostas Papadimas, Nikos Charonitakis)
* Irish (Alastair McKinstry)
* Italian (Leandro sul clementino)
* Japanese (T.Aihana)
* Lithuanian (Zygimantas Berucka)
* Korean (Changwoo Ryu)
* Malay (Hasbullah Bin Pit)
* Norwegian (Kjartan Maraas)
* Polish (GNOME PL Team)
* Portuguese (Duarte Loreto)
* Serbian (Danilo Segan)
* Spanish (Francisco Javier F. Serrador)
* Ukrainian (Maxim Dziumanenko)

Changes in GNOME-Applets 2.5.5
==============================

Overall
* Keynav (Bill Haneman)
* Help fixes (Chee Bin HOH)
* Docs update (Breda McColgan)
* Generalize the way about windows are handled
  between all applets (Archana Shah, Dennis Smit)
* Multi head fixes (Arvind Samptur)
* Build fixes (Jason Leach)
* UI fixes (Sergey V. Oudaltsov, Calum Benson, Shakti Sen)
* I18N fixes (Maxim Dziumanenko)

Gweather
* Fix help, Bug #131894 (Muktha Narayan)
* Add support for forecasts from the Australian Bureau of Meteorology (James Henstridge)

Geyes
* Popup an error dialog when there is a major problem
  with the theme files, Bug #132635 (Dennis Smit)

Mini Commander
* Fix crasher bug #132270 (Fernando Herrera)

Charpick
* Removed "Add a palette.." item from pop
  down menu. Fixes #131887 and #129757 (Michael Terry)
* Make the property window it's dialogs be event
  driven instead of using gtk_dialog_run. Fixes #133087 and #131889
  (Dennis Smit)

Stickynotes
* Property window gets destroyed after applet removal (Vijaykumar Patwari)
* App icon make use of icon theme (SUN Microsystems)

Mixer
* Merge patch from gnome-mixer for gsteamer part. (Kevin Vandersloot)

Translations
* Azerbaijani (Metin Amiroff)
* Spanish (Francisco Javier F. Serrador)
* Czech (Miloslav Trmac)
* Polish (Artur Flinta)
* Albanian (Elian Myftiu)
* Slovenian (Andraz Tori)
* Greek (Kostas Papadimas)
* Serbian (Serbian team (Prevod.org))
* Irish (Alastair McKinstry)
* Dutch (Vincent van Adrighem)
* Korean (Changwoo Ryu)
* Portuguese (Duarte Loreto)
* German (Christian Neumair)
* Japanese (Takeshi AIHANA)
* Norwegian (Kjartan Maraas)

Changes in GNOME-Applets 2.5.0
==============================

Overall
* Docs update (Breda McColgan)
* Fix numerous leaks (Kjartan Maraas)
* Lock down improvements (George Lebl)

Battery Monitor
* Fix high cpu usage and other weird things - bug #88553 (David Moore)

Keyboard Accesibility Status
* Fix many leaks (Jody Goldberg)

Keyboard Layout Switcher
* New international US keyboard (Szbolacs Ban)

5 files changed, 602 insertions, 44 deletions

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index d87528d3a21..30caa08e539 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/01 18:50:52 jmmv Exp $
 #
 
-DISTNAME=		gnome-applets-2.4.2
-PKGREVISION=		6
+DISTNAME=		gnome-applets-2.6.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -21,10 +20,11 @@ USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+PKGCONFIG_OVERRIDE+=	libgswitchit/gswitchit.pc.in
+
 EGDIR=			${PREFIX}/share/examples/gnome-applets
 CONF_FILES=		${EGDIR}/sound/events/mailcheck.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/mailcheck.soundlist
@@ -34,6 +34,7 @@ GCONF2_SCHEMAS+=	charpick.schemas
 GCONF2_SCHEMAS+=	drivemount.schemas
 GCONF2_SCHEMAS+=	geyes.schemas
 GCONF2_SCHEMAS+=	gkb.schemas
+GCONF2_SCHEMAS+=	gswitchit.schemas
 GCONF2_SCHEMAS+=	gtik.schemas
 GCONF2_SCHEMAS+=	gweather.schemas
 GCONF2_SCHEMAS+=	mailcheck.schemas
@@ -51,10 +52,11 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" ||
+    ${OPSYS} == "OpenBSD"
 GCONF2_SCHEMAS+=	battstat.schemas
-PLIST_SUBST+=		BATTSTAT=""
-CONF_FILES+=		${EGDIR}/sound/events/batt_stat_applet.soundlist \
+PLIST_SUBST+=		BATTSTAT=
+CONF_FILES+=		${EGDIR}/sound/events/battstat_applet.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist
 .else
 PLIST_SUBST+=		BATTSTAT="@comment "
@@ -75,6 +77,7 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index 5f674a354ac..9ad25ba00ab 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 18:50:52 jmmv Exp $
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
+bin/gswitchit-plugins-capplet
+include/libgswitchit/gswitchit_plugin.h
+include/libgswitchit/gswitchit_xkb_config.h
 lib/bonobo/servers/GNOME_AccessxStatusApplet.server
-${BATTSTAT}lib/bonobo/servers/GNOME_BattstatApplet.server
+lib/bonobo/servers/GNOME_BattstatApplet.server
 lib/bonobo/servers/GNOME_CDPlayerApplet.server
 lib/bonobo/servers/GNOME_CharpickerApplet.server
 lib/bonobo/servers/GNOME_DriveMountApplet.server
 lib/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 lib/bonobo/servers/GNOME_GeyesApplet.server
 lib/bonobo/servers/GNOME_GtikApplet.server
-lib/bonobo/servers/GNOME_KeyboardApplet_Factory.server
+lib/bonobo/servers/GNOME_KeyboardApplet.server
 lib/bonobo/servers/GNOME_MailcheckApplet_Factory.server
 lib/bonobo/servers/GNOME_MiniCommanderApplet.server
 lib/bonobo/servers/GNOME_MixerApplet.server
@@ -17,14 +20,15 @@ lib/bonobo/servers/GNOME_ModemLightsApplet.server
 lib/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
 lib/bonobo/servers/GNOME_Panel_WirelessApplet.server
 lib/bonobo/servers/GNOME_StickyNotesApplet.server
+lib/pkgconfig/gswitchit.pc
 libexec/accessx-status-applet
 ${BATTSTAT}libexec/battstat-applet-2
 libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
-libexec/gkb-applet-2
 libexec/gnome-applets/mc-install-default-macros
+libexec/gnome-keyboard-applet
 libexec/gtik2_applet2
 libexec/gweather-applet-2
 libexec/mailcheck-applet
@@ -43,6 +47,7 @@ share/gconf/schemas/charpick.schemas
 share/gconf/schemas/drivemount.schemas
 share/gconf/schemas/geyes.schemas
 share/gconf/schemas/gkb.schemas
+share/gconf/schemas/gswitchit.schemas
 share/gconf/schemas/gtik.schemas
 share/gconf/schemas/gweather.schemas
 share/gconf/schemas/mailcheck.schemas
@@ -68,10 +73,11 @@ share/geyes/Horrid/config
 share/geyes/Horrid/horrid_eye.png
 share/geyes/Horrid/horrid_pupil.png
 share/gnome-2.0/ui/GNOME_AccessxApplet.xml
-${BATTSTAT}share/gnome-2.0/ui/GNOME_BattstatApplet.xml
+share/gnome-2.0/ui/GNOME_BattstatApplet.xml
 share/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
 share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
 share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
+share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
 share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 share/gnome-2.0/ui/GNOME_GeyesApplet.xml
 share/gnome-2.0/ui/GNOME_GtikApplet.xml
@@ -219,15 +225,137 @@ share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/legal.xml
 ${BATTSTAT}share/gnome/help/battstat/C/battstat.xml
-${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-apperance.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/battery_small.png
 ${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet.png
-${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-general.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/warning_small.png
 ${BATTSTAT}share/gnome/help/battstat/C/legal.xml
+${BATTSTAT}share/gnome/help/battstat/de/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/de/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/de/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/de/legal.xml
+${BATTSTAT}share/gnome/help/battstat/es/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/es/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/es/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/es/legal.xml
+${BATTSTAT}share/gnome/help/battstat/fr/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/fr/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/fr/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/fr/legal.xml
+${BATTSTAT}share/gnome/help/battstat/it/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/it/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/it/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/it/legal.xml
 ${BATTSTAT}share/gnome/help/battstat/ja/battstat.xml
-${BATTSTAT}share/gnome/help/battstat/ja/figures/battstat-apperance.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/battery_small.png
 ${BATTSTAT}share/gnome/help/battstat/ja/figures/battstat-applet.png
-${BATTSTAT}share/gnome/help/battstat/ja/figures/battstat-general.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/warning_small.png
 ${BATTSTAT}share/gnome/help/battstat/ja/legal.xml
+${BATTSTAT}share/gnome/help/battstat/ko/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/ko/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/ko/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/ko/legal.xml
+${BATTSTAT}share/gnome/help/battstat/sv/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/sv/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/sv/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/sv/legal.xml
+${BATTSTAT}share/gnome/help/battstat/zh_CN/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_CN/legal.xml
+${BATTSTAT}share/gnome/help/battstat/zh_HK/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_HK/legal.xml
+${BATTSTAT}share/gnome/help/battstat/zh_TW/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/ac_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/batt_green.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/batt_orange.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/batt_red.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/batt_yellow.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/battery_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/flash_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/figures/warning_small.png
+${BATTSTAT}share/gnome/help/battstat/zh_TW/legal.xml
 share/gnome/help/cdplayer/C/cdplayer.xml
 share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
@@ -244,6 +372,9 @@ share/gnome/help/cdplayer/de/cdplayer.xml
 share/gnome/help/cdplayer/de/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png
@@ -253,6 +384,9 @@ share/gnome/help/cdplayer/es/cdplayer.xml
 share/gnome/help/cdplayer/es/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png
@@ -262,6 +396,9 @@ share/gnome/help/cdplayer/fr/cdplayer.xml
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png
@@ -271,6 +408,9 @@ share/gnome/help/cdplayer/it/cdplayer.xml
 share/gnome/help/cdplayer/it/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png
@@ -292,6 +432,9 @@ share/gnome/help/cdplayer/ko/cdplayer.xml
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png
@@ -301,6 +444,9 @@ share/gnome/help/cdplayer/sv/cdplayer.xml
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png
@@ -310,15 +456,33 @@ share/gnome/help/cdplayer/zh_CN/cdplayer.xml
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png
 share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png
 share/gnome/help/cdplayer/zh_CN/legal.xml
+share/gnome/help/cdplayer/zh_HK/cdplayer.xml
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/zh_HK/legal.xml
 share/gnome/help/cdplayer/zh_TW/cdplayer.xml
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png
 share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png
@@ -357,13 +521,6 @@ share/gnome/help/char-palette/it/figures/charpick_applet.png
 share/gnome/help/char-palette/it/figures/charpick_characters.png
 share/gnome/help/char-palette/it/figures/charpick_chargroup.png
 share/gnome/help/char-palette/it/legal.xml
-share/gnome/help/char-palette/ja/char-palette.xml
-share/gnome/help/char-palette/ja/figures/charpalette_applet.png
-share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/ja/figures/charpick_applet.png
-share/gnome/help/char-palette/ja/figures/charpick_characters.png
-share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
-share/gnome/help/char-palette/ja/legal.xml
 share/gnome/help/char-palette/ko/char-palette.xml
 share/gnome/help/char-palette/ko/figures/charpalette_applet.png
 share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png
@@ -385,6 +542,10 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png
 share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png
 share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png
 share/gnome/help/char-palette/zh_CN/legal.xml
+share/gnome/help/char-palette/zh_HK/char-palette.xml
+share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png
+share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/zh_HK/legal.xml
 share/gnome/help/char-palette/zh_TW/char-palette.xml
 share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png
 share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png
@@ -419,15 +580,89 @@ share/gnome/help/command-line/sv/legal.xml
 share/gnome/help/command-line/zh_CN/command-line.xml
 share/gnome/help/command-line/zh_CN/figures/command-line.png
 share/gnome/help/command-line/zh_CN/legal.xml
+share/gnome/help/command-line/zh_HK/command-line.xml
+share/gnome/help/command-line/zh_HK/figures/command-line.png
+share/gnome/help/command-line/zh_HK/legal.xml
 share/gnome/help/command-line/zh_TW/command-line.xml
 share/gnome/help/command-line/zh_TW/figures/command-line.png
 share/gnome/help/command-line/zh_TW/legal.xml
 share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount-applet_window.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
 share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/de/drivemount.xml
+share/gnome/help/drivemount/de/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/de/legal.xml
+share/gnome/help/drivemount/es/drivemount.xml
+share/gnome/help/drivemount/es/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/es/legal.xml
+share/gnome/help/drivemount/fr/drivemount.xml
+share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/fr/legal.xml
+share/gnome/help/drivemount/it/drivemount.xml
+share/gnome/help/drivemount/it/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/it/legal.xml
+share/gnome/help/drivemount/ja/drivemount.xml
+share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ja/legal.xml
+share/gnome/help/drivemount/ko/drivemount.xml
+share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/ko/legal.xml
+share/gnome/help/drivemount/sv/drivemount.xml
+share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/sv/legal.xml
+share/gnome/help/drivemount/zh_CN/drivemount.xml
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_CN/legal.xml
+share/gnome/help/drivemount/zh_HK/drivemount.xml
+share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_HK/legal.xml
+share/gnome/help/drivemount/zh_TW/drivemount.xml
+share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/zh_TW/legal.xml
 share/gnome/help/geyes/C/figures/geyes_applet.png
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
@@ -463,6 +698,9 @@ share/gnome/help/geyes/zh_CN/figures/geyes_applet.png
 share/gnome/help/geyes/zh_CN/figures/geyes_settings.png
 share/gnome/help/geyes/zh_CN/geyes.xml
 share/gnome/help/geyes/zh_CN/legal.xml
+share/gnome/help/geyes/zh_HK/figures/geyes_applet.png
+share/gnome/help/geyes/zh_HK/geyes.xml
+share/gnome/help/geyes/zh_HK/legal.xml
 share/gnome/help/geyes/zh_TW/figures/geyes_applet.png
 share/gnome/help/geyes/zh_TW/figures/geyes_settings.png
 share/gnome/help/geyes/zh_TW/geyes.xml
@@ -494,6 +732,9 @@ share/gnome/help/gkb/sv/legal.xml
 share/gnome/help/gkb/zh_CN/figures/gkb_applet.png
 share/gnome/help/gkb/zh_CN/gkb.xml
 share/gnome/help/gkb/zh_CN/legal.xml
+share/gnome/help/gkb/zh_HK/figures/gkb_applet.png
+share/gnome/help/gkb/zh_HK/gkb.xml
+share/gnome/help/gkb/zh_HK/legal.xml
 share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
 share/gnome/help/gkb/zh_TW/gkb.xml
 share/gnome/help/gkb/zh_TW/legal.xml
@@ -524,6 +765,9 @@ share/gnome/help/gtik2_applet2/sv/legal.xml
 share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/zh_CN/legal.xml
+share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/zh_HK/legal.xml
 share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/zh_TW/legal.xml
@@ -572,6 +816,11 @@ share/gnome/help/gweather/zh_CN/figures/gweather_settings.png
 share/gnome/help/gweather/zh_CN/figures/gweather_weather.png
 share/gnome/help/gweather/zh_CN/gweather.xml
 share/gnome/help/gweather/zh_CN/legal.xml
+share/gnome/help/gweather/zh_HK/figures/gweather_applet.png
+share/gnome/help/gweather/zh_HK/figures/gweather_settings.png
+share/gnome/help/gweather/zh_HK/figures/gweather_weather.png
+share/gnome/help/gweather/zh_HK/gweather.xml
+share/gnome/help/gweather/zh_HK/legal.xml
 share/gnome/help/gweather/zh_TW/figures/gweather_applet.png
 share/gnome/help/gweather/zh_TW/figures/gweather_settings.png
 share/gnome/help/gweather/zh_TW/figures/gweather_weather.png
@@ -604,6 +853,11 @@ share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/it/legal.xml
 share/gnome/help/mailcheck/it/mailcheck.xml
+share/gnome/help/mailcheck/ja/figures/charpalette_applet.png
+share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png
+share/gnome/help/mailcheck/ja/figures/charpick_applet.png
+share/gnome/help/mailcheck/ja/figures/charpick_characters.png
+share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png
 share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/ja/legal.xml
 share/gnome/help/mailcheck/ja/mailcheck.xml
@@ -625,6 +879,9 @@ share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/zh_CN/legal.xml
 share/gnome/help/mailcheck/zh_CN/mailcheck.xml
+share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_HK/legal.xml
+share/gnome/help/mailcheck/zh_HK/mailcheck.xml
 share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
 share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
 share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
@@ -646,6 +903,10 @@ share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/legal.xml
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
+share/gnome/help/mixer_applet2/it/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/it/legal.xml
+share/gnome/help/mixer_applet2/it/mixer_applet2.xml
 share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/ja/legal.xml
@@ -662,6 +923,9 @@ share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/zh_CN/legal.xml
 share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml
+share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/zh_HK/legal.xml
+share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml
 share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/zh_TW/legal.xml
@@ -686,10 +950,117 @@ share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
 share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
 share/gnome/help/modemlights/C/legal.xml
 share/gnome/help/modemlights/C/modemlights.xml
+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/figures/system_monitor_prefs.png
+share/gnome/help/multiload/C/legal.xml
+share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/de/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/de/legal.xml
+share/gnome/help/multiload/de/multiload.xml
+share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/es/legal.xml
+share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/fr/legal.xml
+share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/it/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/it/legal.xml
+share/gnome/help/multiload/it/multiload.xml
+share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ja/legal.xml
+share/gnome/help/multiload/ja/multiload.xml
+share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ko/legal.xml
+share/gnome/help/multiload/ko/multiload.xml
+share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/sv/legal.xml
+share/gnome/help/multiload/sv/multiload.xml
+share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_CN/legal.xml
+share/gnome/help/multiload/zh_CN/multiload.xml
+share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_HK/legal.xml
+share/gnome/help/multiload/zh_HK/multiload.xml
+share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_TW/legal.xml
+share/gnome/help/multiload/zh_TW/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/de/legal.xml
+share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/es/legal.xml
+share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/fr/legal.xml
+share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/it/legal.xml
+share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ja/legal.xml
+share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ko/legal.xml
+share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/sv/legal.xml
+share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_CN/legal.xml
+share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_HK/legal.xml
+share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_TW/legal.xml
+share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml
 share/gnome/help/wireless/C/legal.xml
 share/gnome/help/wireless/C/wireless.xml
+share/gnome/help/wireless/de/figures/wireless_applet_conn.png
+share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/de/legal.xml
+share/gnome/help/wireless/de/wireless.xml
+share/gnome/help/wireless/es/figures/wireless_applet_conn.png
+share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/es/legal.xml
+share/gnome/help/wireless/es/wireless.xml
+share/gnome/help/wireless/fr/figures/wireless_applet_conn.png
+share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/fr/legal.xml
+share/gnome/help/wireless/fr/wireless.xml
+share/gnome/help/wireless/it/figures/wireless_applet_conn.png
+share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/it/legal.xml
+share/gnome/help/wireless/it/wireless.xml
+share/gnome/help/wireless/ja/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ja/legal.xml
+share/gnome/help/wireless/ja/wireless.xml
+share/gnome/help/wireless/ko/figures/wireless_applet_conn.png
+share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/ko/legal.xml
+share/gnome/help/wireless/ko/wireless.xml
+share/gnome/help/wireless/sv/figures/wireless_applet_conn.png
+share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/sv/legal.xml
+share/gnome/help/wireless/sv/wireless.xml
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_CN/legal.xml
+share/gnome/help/wireless/zh_CN/wireless.xml
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_HK/legal.xml
+share/gnome/help/wireless/zh_HK/wireless.xml
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png
+share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png
+share/gnome/help/wireless/zh_TW/legal.xml
+share/gnome/help/wireless/zh_TW/wireless.xml
+share/gswitchit/gswitchit-plugins.glade
+share/gswitchit/gswitchit-properties.glade
 share/gweather/Locations
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
@@ -703,6 +1074,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
@@ -714,6 +1086,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
@@ -735,10 +1108,12 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
@@ -747,7 +1122,16 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 share/omf/gnome-applets/accessx-status-C.omf
 ${BATTSTAT}share/omf/gnome-applets/battstat-C.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-de.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-es.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-fr.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-it.omf
 ${BATTSTAT}share/omf/gnome-applets/battstat-ja.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-ko.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-sv.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-zh_CN.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-zh_HK.omf
+${BATTSTAT}share/omf/gnome-applets/battstat-zh_TW.omf
 share/omf/gnome-applets/cdplayer-C.omf
 share/omf/gnome-applets/cdplayer-de.omf
 share/omf/gnome-applets/cdplayer-es.omf
@@ -757,16 +1141,17 @@ share/omf/gnome-applets/cdplayer-ja.omf
 share/omf/gnome-applets/cdplayer-ko.omf
 share/omf/gnome-applets/cdplayer-sv.omf
 share/omf/gnome-applets/cdplayer-zh_CN.omf
+share/omf/gnome-applets/cdplayer-zh_HK.omf
 share/omf/gnome-applets/cdplayer-zh_TW.omf
 share/omf/gnome-applets/char-palette-C.omf
 share/omf/gnome-applets/char-palette-de.omf
 share/omf/gnome-applets/char-palette-es.omf
 share/omf/gnome-applets/char-palette-fr.omf
 share/omf/gnome-applets/char-palette-it.omf
-share/omf/gnome-applets/char-palette-ja.omf
 share/omf/gnome-applets/char-palette-ko.omf
 share/omf/gnome-applets/char-palette-sv.omf
 share/omf/gnome-applets/char-palette-zh_CN.omf
+share/omf/gnome-applets/char-palette-zh_HK.omf
 share/omf/gnome-applets/char-palette-zh_TW.omf
 share/omf/gnome-applets/command-line-C.omf
 share/omf/gnome-applets/command-line-de.omf
@@ -777,8 +1162,19 @@ share/omf/gnome-applets/command-line-ja.omf
 share/omf/gnome-applets/command-line-ko.omf
 share/omf/gnome-applets/command-line-sv.omf
 share/omf/gnome-applets/command-line-zh_CN.omf
+share/omf/gnome-applets/command-line-zh_HK.omf
 share/omf/gnome-applets/command-line-zh_TW.omf
 share/omf/gnome-applets/drivemount-C.omf
+share/omf/gnome-applets/drivemount-de.omf
+share/omf/gnome-applets/drivemount-es.omf
+share/omf/gnome-applets/drivemount-fr.omf
+share/omf/gnome-applets/drivemount-it.omf
+share/omf/gnome-applets/drivemount-ja.omf
+share/omf/gnome-applets/drivemount-ko.omf
+share/omf/gnome-applets/drivemount-sv.omf
+share/omf/gnome-applets/drivemount-zh_CN.omf
+share/omf/gnome-applets/drivemount-zh_HK.omf
+share/omf/gnome-applets/drivemount-zh_TW.omf
 share/omf/gnome-applets/geyes-C.omf
 share/omf/gnome-applets/geyes-de.omf
 share/omf/gnome-applets/geyes-es.omf
@@ -788,6 +1184,7 @@ share/omf/gnome-applets/geyes-ja.omf
 share/omf/gnome-applets/geyes-ko.omf
 share/omf/gnome-applets/geyes-sv.omf
 share/omf/gnome-applets/geyes-zh_CN.omf
+share/omf/gnome-applets/geyes-zh_HK.omf
 share/omf/gnome-applets/geyes-zh_TW.omf
 share/omf/gnome-applets/gkb-C.omf
 share/omf/gnome-applets/gkb-de.omf
@@ -798,6 +1195,7 @@ share/omf/gnome-applets/gkb-ja.omf
 share/omf/gnome-applets/gkb-ko.omf
 share/omf/gnome-applets/gkb-sv.omf
 share/omf/gnome-applets/gkb-zh_CN.omf
+share/omf/gnome-applets/gkb-zh_HK.omf
 share/omf/gnome-applets/gkb-zh_TW.omf
 share/omf/gnome-applets/gtik2_applet2-C.omf
 share/omf/gnome-applets/gtik2_applet2-de.omf
@@ -808,6 +1206,7 @@ share/omf/gnome-applets/gtik2_applet2-ja.omf
 share/omf/gnome-applets/gtik2_applet2-ko.omf
 share/omf/gnome-applets/gtik2_applet2-sv.omf
 share/omf/gnome-applets/gtik2_applet2-zh_CN.omf
+share/omf/gnome-applets/gtik2_applet2-zh_HK.omf
 share/omf/gnome-applets/gtik2_applet2-zh_TW.omf
 share/omf/gnome-applets/gweather-C.omf
 share/omf/gnome-applets/gweather-de.omf
@@ -818,6 +1217,7 @@ share/omf/gnome-applets/gweather-ja.omf
 share/omf/gnome-applets/gweather-ko.omf
 share/omf/gnome-applets/gweather-sv.omf
 share/omf/gnome-applets/gweather-zh_CN.omf
+share/omf/gnome-applets/gweather-zh_HK.omf
 share/omf/gnome-applets/gweather-zh_TW.omf
 share/omf/gnome-applets/mailcheck-C.omf
 share/omf/gnome-applets/mailcheck-de.omf
@@ -828,19 +1228,53 @@ share/omf/gnome-applets/mailcheck-ja.omf
 share/omf/gnome-applets/mailcheck-ko.omf
 share/omf/gnome-applets/mailcheck-sv.omf
 share/omf/gnome-applets/mailcheck-zh_CN.omf
+share/omf/gnome-applets/mailcheck-zh_HK.omf
 share/omf/gnome-applets/mailcheck-zh_TW.omf
 share/omf/gnome-applets/mixer_applet2-C.omf
 share/omf/gnome-applets/mixer_applet2-de.omf
 share/omf/gnome-applets/mixer_applet2-es.omf
 share/omf/gnome-applets/mixer_applet2-fr.omf
+share/omf/gnome-applets/mixer_applet2-it.omf
 share/omf/gnome-applets/mixer_applet2-ja.omf
 share/omf/gnome-applets/mixer_applet2-ko.omf
 share/omf/gnome-applets/mixer_applet2-sv.omf
 share/omf/gnome-applets/mixer_applet2-zh_CN.omf
+share/omf/gnome-applets/mixer_applet2-zh_HK.omf
 share/omf/gnome-applets/mixer_applet2-zh_TW.omf
 share/omf/gnome-applets/modemlights-C.omf
+share/omf/gnome-applets/multiload-C.omf
+share/omf/gnome-applets/multiload-de.omf
+share/omf/gnome-applets/multiload-es.omf
+share/omf/gnome-applets/multiload-fr.omf
+share/omf/gnome-applets/multiload-it.omf
+share/omf/gnome-applets/multiload-ja.omf
+share/omf/gnome-applets/multiload-ko.omf
+share/omf/gnome-applets/multiload-sv.omf
+share/omf/gnome-applets/multiload-zh_CN.omf
+share/omf/gnome-applets/multiload-zh_HK.omf
+share/omf/gnome-applets/multiload-zh_TW.omf
 share/omf/gnome-applets/stickynotes_applet-C.omf
+share/omf/gnome-applets/stickynotes_applet-de.omf
+share/omf/gnome-applets/stickynotes_applet-es.omf
+share/omf/gnome-applets/stickynotes_applet-fr.omf
+share/omf/gnome-applets/stickynotes_applet-it.omf
+share/omf/gnome-applets/stickynotes_applet-ja.omf
+share/omf/gnome-applets/stickynotes_applet-ko.omf
+share/omf/gnome-applets/stickynotes_applet-sv.omf
+share/omf/gnome-applets/stickynotes_applet-zh_CN.omf
+share/omf/gnome-applets/stickynotes_applet-zh_HK.omf
+share/omf/gnome-applets/stickynotes_applet-zh_TW.omf
 share/omf/gnome-applets/wireless-C.omf
+share/omf/gnome-applets/wireless-de.omf
+share/omf/gnome-applets/wireless-es.omf
+share/omf/gnome-applets/wireless-fr.omf
+share/omf/gnome-applets/wireless-it.omf
+share/omf/gnome-applets/wireless-ja.omf
+share/omf/gnome-applets/wireless-ko.omf
+share/omf/gnome-applets/wireless-sv.omf
+share/omf/gnome-applets/wireless-zh_CN.omf
+share/omf/gnome-applets/wireless-zh_HK.omf
+share/omf/gnome-applets/wireless-zh_TW.omf
 share/pixmaps/accessx-status-applet/ax-applet.png
 share/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/pixmaps/accessx-status-applet/ax-key-base.png
@@ -958,11 +1392,11 @@ share/pixmaps/gkb/uy.png
 share/pixmaps/gkb/vn.png
 share/pixmaps/gkb/ye.png
 share/pixmaps/gkb/yu.png
-share/pixmaps/gnome-cdplayer-icon.png
 share/pixmaps/gnome-cpu.png
 share/pixmaps/gnome-eyes.png
 share/pixmaps/gnome-mini-commander.png
-share/pixmaps/gweather/tstorm.xpm
+share/pixmaps/gswitchit-applet.png
+share/pixmaps/gswitchit-properties-capplet.png
 share/pixmaps/mailcheck/eclouds.png
 share/pixmaps/mailcheck/email-e.png
 share/pixmaps/mailcheck/email-eclouds.png
@@ -1086,21 +1520,87 @@ share/xmodmap/xmodmap.yu
 @dirrm share/pixmaps/mixer
 @dirrm share/pixmaps/mini-commander
 @dirrm share/pixmaps/mailcheck
-@dirrm share/pixmaps/gweather
 @dirrm share/pixmaps/gkb
 @dirrm share/pixmaps/accessx-status-applet
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-applets
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gweather
+@dirrm share/gswitchit
+@dirrm share/gnome/help/wireless/zh_TW/figures
+@dirrm share/gnome/help/wireless/zh_TW
+@dirrm share/gnome/help/wireless/zh_HK/figures
+@dirrm share/gnome/help/wireless/zh_HK
+@dirrm share/gnome/help/wireless/zh_CN/figures
+@dirrm share/gnome/help/wireless/zh_CN
+@dirrm share/gnome/help/wireless/sv/figures
+@dirrm share/gnome/help/wireless/sv
+@dirrm share/gnome/help/wireless/ko/figures
+@dirrm share/gnome/help/wireless/ko
+@dirrm share/gnome/help/wireless/ja/figures
+@dirrm share/gnome/help/wireless/ja
+@dirrm share/gnome/help/wireless/it/figures
+@dirrm share/gnome/help/wireless/it
+@dirrm share/gnome/help/wireless/fr/figures
+@dirrm share/gnome/help/wireless/fr
+@dirrm share/gnome/help/wireless/es/figures
+@dirrm share/gnome/help/wireless/es
+@dirrm share/gnome/help/wireless/de/figures
+@dirrm share/gnome/help/wireless/de
 @dirrm share/gnome/help/wireless/C
 @dirrm share/gnome/help/wireless
+@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_TW
+@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_HK
+@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_CN
+@dirrm share/gnome/help/stickynotes_applet/sv/figures
+@dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/ko/figures
+@dirrm share/gnome/help/stickynotes_applet/ko
+@dirrm share/gnome/help/stickynotes_applet/ja/figures
+@dirrm share/gnome/help/stickynotes_applet/ja
+@dirrm share/gnome/help/stickynotes_applet/it/figures
+@dirrm share/gnome/help/stickynotes_applet/it
+@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/de/figures
+@dirrm share/gnome/help/stickynotes_applet/de
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/zh_TW/figures
+@dirrm share/gnome/help/multiload/zh_TW
+@dirrm share/gnome/help/multiload/zh_HK/figures
+@dirrm share/gnome/help/multiload/zh_HK
+@dirrm share/gnome/help/multiload/zh_CN/figures
+@dirrm share/gnome/help/multiload/zh_CN
+@dirrm share/gnome/help/multiload/sv/figures
+@dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ko/figures
+@dirrm share/gnome/help/multiload/ko
+@dirrm share/gnome/help/multiload/ja/figures
+@dirrm share/gnome/help/multiload/ja
+@dirrm share/gnome/help/multiload/it/figures
+@dirrm share/gnome/help/multiload/it
+@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/de/figures
+@dirrm share/gnome/help/multiload/de
+@dirrm share/gnome/help/multiload/C/figures
+@dirrm share/gnome/help/multiload/C
+@dirrm share/gnome/help/multiload
 @dirrm share/gnome/help/modemlights/C/figures
 @dirrm share/gnome/help/modemlights/C
 @dirrm share/gnome/help/modemlights
 @dirrm share/gnome/help/mixer_applet2/zh_TW/figures
 @dirrm share/gnome/help/mixer_applet2/zh_TW
+@dirrm share/gnome/help/mixer_applet2/zh_HK/figures
+@dirrm share/gnome/help/mixer_applet2/zh_HK
 @dirrm share/gnome/help/mixer_applet2/zh_CN/figures
 @dirrm share/gnome/help/mixer_applet2/zh_CN
 @dirrm share/gnome/help/mixer_applet2/sv/figures
@@ -1109,6 +1609,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/mixer_applet2/ko
 @dirrm share/gnome/help/mixer_applet2/ja/figures
 @dirrm share/gnome/help/mixer_applet2/ja
+@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
@@ -1120,6 +1622,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/mixer_applet2
 @dirrm share/gnome/help/mailcheck/zh_TW/figures
 @dirrm share/gnome/help/mailcheck/zh_TW
+@dirrm share/gnome/help/mailcheck/zh_HK/figures
+@dirrm share/gnome/help/mailcheck/zh_HK
 @dirrm share/gnome/help/mailcheck/zh_CN/figures
 @dirrm share/gnome/help/mailcheck/zh_CN
 @dirrm share/gnome/help/mailcheck/sv/figures
@@ -1141,6 +1645,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/mailcheck
 @dirrm share/gnome/help/gweather/zh_TW/figures
 @dirrm share/gnome/help/gweather/zh_TW
+@dirrm share/gnome/help/gweather/zh_HK/figures
+@dirrm share/gnome/help/gweather/zh_HK
 @dirrm share/gnome/help/gweather/zh_CN/figures
 @dirrm share/gnome/help/gweather/zh_CN
 @dirrm share/gnome/help/gweather/sv/figures
@@ -1162,6 +1668,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gweather
 @dirrm share/gnome/help/gtik2_applet2/zh_TW/figures
 @dirrm share/gnome/help/gtik2_applet2/zh_TW
+@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures
+@dirrm share/gnome/help/gtik2_applet2/zh_HK
 @dirrm share/gnome/help/gtik2_applet2/zh_CN/figures
 @dirrm share/gnome/help/gtik2_applet2/zh_CN
 @dirrm share/gnome/help/gtik2_applet2/sv/figures
@@ -1183,6 +1691,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gtik2_applet2
 @dirrm share/gnome/help/gkb/zh_TW/figures
 @dirrm share/gnome/help/gkb/zh_TW
+@dirrm share/gnome/help/gkb/zh_HK/figures
+@dirrm share/gnome/help/gkb/zh_HK
 @dirrm share/gnome/help/gkb/zh_CN/figures
 @dirrm share/gnome/help/gkb/zh_CN
 @dirrm share/gnome/help/gkb/sv/figures
@@ -1204,6 +1714,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gkb
 @dirrm share/gnome/help/geyes/zh_TW/figures
 @dirrm share/gnome/help/geyes/zh_TW
+@dirrm share/gnome/help/geyes/zh_HK/figures
+@dirrm share/gnome/help/geyes/zh_HK
 @dirrm share/gnome/help/geyes/zh_CN/figures
 @dirrm share/gnome/help/geyes/zh_CN
 @dirrm share/gnome/help/geyes/sv/figures
@@ -1223,11 +1735,33 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/geyes/C/figures
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/zh_TW/figures
+@dirrm share/gnome/help/drivemount/zh_TW
+@dirrm share/gnome/help/drivemount/zh_HK/figures
+@dirrm share/gnome/help/drivemount/zh_HK
+@dirrm share/gnome/help/drivemount/zh_CN/figures
+@dirrm share/gnome/help/drivemount/zh_CN
+@dirrm share/gnome/help/drivemount/sv/figures
+@dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ko/figures
+@dirrm share/gnome/help/drivemount/ko
+@dirrm share/gnome/help/drivemount/ja/figures
+@dirrm share/gnome/help/drivemount/ja
+@dirrm share/gnome/help/drivemount/it/figures
+@dirrm share/gnome/help/drivemount/it
+@dirrm share/gnome/help/drivemount/fr/figures
+@dirrm share/gnome/help/drivemount/fr
+@dirrm share/gnome/help/drivemount/es/figures
+@dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/de/figures
+@dirrm share/gnome/help/drivemount/de
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
 @dirrm share/gnome/help/command-line/zh_TW/figures
 @dirrm share/gnome/help/command-line/zh_TW
+@dirrm share/gnome/help/command-line/zh_HK/figures
+@dirrm share/gnome/help/command-line/zh_HK
 @dirrm share/gnome/help/command-line/zh_CN/figures
 @dirrm share/gnome/help/command-line/zh_CN
 @dirrm share/gnome/help/command-line/sv/figures
@@ -1249,14 +1783,14 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/zh_TW/figures
 @dirrm share/gnome/help/char-palette/zh_TW
+@dirrm share/gnome/help/char-palette/zh_HK/figures
+@dirrm share/gnome/help/char-palette/zh_HK
 @dirrm share/gnome/help/char-palette/zh_CN/figures
 @dirrm share/gnome/help/char-palette/zh_CN
 @dirrm share/gnome/help/char-palette/sv/figures
 @dirrm share/gnome/help/char-palette/sv
 @dirrm share/gnome/help/char-palette/ko/figures
 @dirrm share/gnome/help/char-palette/ko
-@dirrm share/gnome/help/char-palette/ja/figures
-@dirrm share/gnome/help/char-palette/ja
 @dirrm share/gnome/help/char-palette/it/figures
 @dirrm share/gnome/help/char-palette/it
 @dirrm share/gnome/help/char-palette/fr/figures
@@ -1270,6 +1804,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/char-palette
 @dirrm share/gnome/help/cdplayer/zh_TW/figures
 @dirrm share/gnome/help/cdplayer/zh_TW
+@dirrm share/gnome/help/cdplayer/zh_HK/figures
+@dirrm share/gnome/help/cdplayer/zh_HK
 @dirrm share/gnome/help/cdplayer/zh_CN/figures
 @dirrm share/gnome/help/cdplayer/zh_CN
 @dirrm share/gnome/help/cdplayer/sv/figures
@@ -1289,8 +1825,26 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/cdplayer/C/figures
 @dirrm share/gnome/help/cdplayer/C
 @dirrm share/gnome/help/cdplayer
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_TW/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_TW
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_HK/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_HK
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_CN/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/zh_CN
+${BATTSTAT}@dirrm share/gnome/help/battstat/sv/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/sv
+${BATTSTAT}@dirrm share/gnome/help/battstat/ko/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/ko
 ${BATTSTAT}@dirrm share/gnome/help/battstat/ja/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/ja
+${BATTSTAT}@dirrm share/gnome/help/battstat/it/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/it
+${BATTSTAT}@dirrm share/gnome/help/battstat/fr/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/fr
+${BATTSTAT}@dirrm share/gnome/help/battstat/es/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/es
+${BATTSTAT}@dirrm share/gnome/help/battstat/de/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/de
 ${BATTSTAT}@dirrm share/gnome/help/battstat/C/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/C
 ${BATTSTAT}@dirrm share/gnome/help/battstat
@@ -1300,7 +1854,7 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/gkb
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
-@comment in gnome2-dirs: @dirrm share/gnome-2.0
+@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm share/geyes/Horrid
 @dirrm share/geyes/Default-tiny
 @dirrm share/geyes/Default
@@ -1308,10 +1862,11 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 @dirrm share/geyes/Bizarre
 @dirrm share/geyes
 @dirrm share/gen_util
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome-applets/sound/events
 @dirrm share/examples/gnome-applets/sound
 @dirrm share/examples/gnome-applets
-@comment in GConf2: @dirrm share/gconf/schemas
 ${BATTSTAT}@dirrm share/battstat_applet
 @dirrm libexec/gnome-applets
 @comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/libgswitchit
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index 631803e8365..e0306553a21 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
-SHA1 (gnome-applets-2.4.2.tar.bz2) = bf752ae4caca9851bd4c1d64b244e3da24092b21
-Size (gnome-applets-2.4.2.tar.bz2) = 4057266 bytes
-SHA1 (patch-aa) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
-SHA1 (patch-ab) = 9532d2e30a375efc22194e92347b67aa876fee8e
+SHA1 (gnome-applets-2.6.0.tar.bz2) = 835d220a3c330b6da81947071e92308751eaa445
+Size (gnome-applets-2.6.0.tar.bz2) = 4643605 bytes
+SHA1 (patch-aa) = 4805b1cc7ed960ad6672f447636565c5ddc6fc93
+SHA1 (patch-ab) = 7a38278110675ebbb21f3441dd277209001768dc
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome2-applets/patches/patch-aa
index 10fb0bec7c5..1c64ad3e229 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome2-applets/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
---- battstat/sounds/Makefile.in.orig	2003-12-13 15:42:24.000000000 -0600
+--- battstat/sounds/Makefile.in.orig	2004-03-10 13:58:12.000000000 +0100
 +++ battstat/sounds/Makefile.in
-@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
- X_LIBS = @X_LIBS@
+@@ -166,7 +166,7 @@ am__quote = @am__quote@
  gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
  
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = $(datadir)/examples/gnome-applets/sound/events
diff --git a/x11/gnome2-applets/patches/patch-ab b/x11/gnome2-applets/patches/patch-ab
index f8e4b793310..c41015d06be 100644
--- a/x11/gnome2-applets/patches/patch-ab
+++ b/x11/gnome2-applets/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
---- mailcheck/Makefile.in.orig	2003-12-13 15:40:45.000000000 -0600
+--- mailcheck/Makefile.in.orig	2004-03-10 13:59:15.000000000 +0100
 +++ mailcheck/Makefile.in
-@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
+@@ -214,7 +214,7 @@ MAILCHECK_BITMAPS = \
  mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
  mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)