Update to 2.4.1, thanks to Min Sik kim and Soren Jacobsen.

Changes include several translation updates, addition of new features
and some bug fixing. Please review the Changelog file to see a full
list of changes.

10 files changed, 1302 insertions, 60 deletions

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 2c915b32f0d..9bba4bcbc0c 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/12/28 23:37:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/29 12:05:20 xtraeme Exp $
 #
 
-DISTNAME=		gnome-applets-2.2.1
-PKGREVISION=		6
+DISTNAME=		gnome-applets-2.4.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -24,23 +23,54 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-GCONF2_SCHEMAS=		charpick.schemas
+EGDIR=			${PREFIX}/share/examples/gnome-applets
+CONF_FILES=		${EGDIR}/sound/events/mailcheck.soundlist \
+			${PKG_SYSCONFDIR}/sound/events/mailcheck.soundlist
+
+GCONF2_SCHEMAS=		cdplayer.schemas
+GCONF2_SCHEMAS+=	charpick.schemas
 GCONF2_SCHEMAS+=	drivemount.schemas
 GCONF2_SCHEMAS+=	geyes.schemas
 GCONF2_SCHEMAS+=	gkb.schemas
 GCONF2_SCHEMAS+=	gtik.schemas
 GCONF2_SCHEMAS+=	gweather.schemas
+GCONF2_SCHEMAS+=	mailcheck.schemas
 GCONF2_SCHEMAS+=	mini-commander.schemas
+GCONF2_SCHEMAS+=	mixer.schemas
 GCONF2_SCHEMAS+=	modemlights.schemas
 GCONF2_SCHEMAS+=	multiload.schemas
+GCONF2_SCHEMAS+=	stickynotes.schemas
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=		USE_INET6
+
+.if !empty(USE_INET6:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+GCONF2_SCHEMAS+=	battstat.schemas
+PLIST_SUBST+=		BATTSTAT=""
+CONF_FILES+=		${EGDIR}/sound/events/batt_stat_applet.soundlist \
+			${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist
+.else
+PLIST_SUBST+=		BATTSTAT="@comment "
+.endif
 
 .include "../../devel/GConf2/schemas.mk"
+INSTALL_EXTRA_TMPL+=	${FILESDIR}/install.tmpl
+
 .include "../../devel/gail/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade2/buildlink2.mk"
+.include "../../devel/libgnome/buildlink2.mk"
 .include "../../devel/libgtop2/buildlink2.mk"
+.include "../../sysutils/gnome-vfs2/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-panel/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index cf128fe8b74..2796dbc7610 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,16 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/20 23:19:24 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
 bin/gkb_xmmap
+bin/gnome-keyboard-layout
+lib/bonobo/servers/GNOME_AccessxStatusApplet.server
+${BATTSTAT}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_MailcheckApplet_Factory.server
 lib/bonobo/servers/GNOME_MiniCommanderApplet.server
 lib/bonobo/servers/GNOME_MixerApplet.server
 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
+libexec/accessx-status-applet
+${BATTSTAT}libexec/battstat-applet-2
+libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
@@ -18,20 +27,30 @@ libexec/gkb-applet-2
 libexec/gnome-applets/mc-install-default-macros
 libexec/gtik2_applet2
 libexec/gweather-applet-2
+libexec/mailcheck-applet
 libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/stickynotes_applet
 libexec/wireless-applet
+${BATTSTAT}share/battstat_applet/battstat_applet.glade
+${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist
+share/examples/gnome-applets/sound/events/mailcheck.soundlist
+${BATTSTAT}share/gconf/schemas/battstat.schemas
+share/gconf/schemas/cdplayer.schemas
 share/gconf/schemas/charpick.schemas
 share/gconf/schemas/drivemount.schemas
 share/gconf/schemas/geyes.schemas
 share/gconf/schemas/gkb.schemas
 share/gconf/schemas/gtik.schemas
 share/gconf/schemas/gweather.schemas
+share/gconf/schemas/mailcheck.schemas
 share/gconf/schemas/mini-commander.schemas
+share/gconf/schemas/mixer.schemas
 share/gconf/schemas/modemlights.schemas
 share/gconf/schemas/multiload.schemas
+share/gconf/schemas/stickynotes.schemas
 share/gen_util/mini-commander.glade
 share/geyes/Bizarre/Bizarre-eye.png
 share/geyes/Bizarre/Bizarre-pupil.png
@@ -48,16 +67,21 @@ share/geyes/Default/config
 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_CDPlayerApplet.xml
 share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
 share/gnome-2.0/ui/GNOME_DriveMountApplet.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
 share/gnome-2.0/ui/GNOME_KeyboardApplet.xml
+share/gnome-2.0/ui/GNOME_MailCheckApplet.xml
 share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
 share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 share/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gkb/AM_Armenian.keyprop
 share/gnome/gkb/AR_Arabic.keyprop
@@ -75,7 +99,7 @@ share/gnome/gkb/Belgian.keyprop
 share/gnome/gkb/BulgarianCyril.keyprop
 share/gnome/gkb/CA_English.keyprop
 share/gnome/gkb/CH_German_x.keyprop
-share/gnome/gkb/CS_Czech.keyprop
+share/gnome/gkb/CZ_Czech.keyprop
 share/gnome/gkb/CZ_Czech_Slovak.keyprop
 share/gnome/gkb/CZ_Czech_x.keyprop
 share/gnome/gkb/DE_German.keyprop
@@ -97,10 +121,6 @@ share/gnome/gkb/FR_French_x.keyprop
 share/gnome/gkb/FrenchCanadian.keyprop
 share/gnome/gkb/FrenchCanadian2.keyprop
 share/gnome/gkb/FrenchSwiss.keyprop
-share/gnome/gkb/GB-102.keyprop
-share/gnome/gkb/GB.keyprop
-share/gnome/gkb/GB_English.keyprop
-share/gnome/gkb/GB_English_x.keyprop
 share/gnome/gkb/GE_Georgian_x.keyprop
 share/gnome/gkb/GR_Greek.keyprop
 share/gnome/gkb/GR_Greek_x.keyprop
@@ -132,6 +152,10 @@ share/gnome/gkb/LT_Lithuanian_x.keyprop
 share/gnome/gkb/LT_Prog.keyprop
 share/gnome/gkb/LT_Standard.keyprop
 share/gnome/gkb/MK_Macedonian.keyprop
+share/gnome/gkb/MN_Mongolian.keyprop
+share/gnome/gkb/MN_Mongolian_x.keyprop
+share/gnome/gkb/MN_Mongolian_x_rev.keyprop
+share/gnome/gkb/MN_Mongolian_x_uni.keyprop
 share/gnome/gkb/Macedonian.keyprop
 share/gnome/gkb/NL_Dutch_x.keyprop
 share/gnome/gkb/NO_Norwegian.keyprop
@@ -149,11 +173,16 @@ share/gnome/gkb/RU_Russian_x.keyprop
 share/gnome/gkb/RU_Russian_x_rev.keyprop
 share/gnome/gkb/RussianCyril.keyprop
 share/gnome/gkb/SE_Swedish.keyprop
+share/gnome/gkb/SE_Swedish_x.keyprop
 share/gnome/gkb/SI_Slovenian.keyprop
+share/gnome/gkb/SI_Slovenian_x.keyprop
 share/gnome/gkb/SR_Dutch.keyprop
 share/gnome/gkb/Slovak.keyprop
+share/gnome/gkb/Slovene.keyprop
 share/gnome/gkb/Slovenian.keyprop
 share/gnome/gkb/Swedish.keyprop
+share/gnome/gkb/Syriac.keyprop
+share/gnome/gkb/Syriac_Phonetic.keyprop
 share/gnome/gkb/TH_Thai.keyprop
 share/gnome/gkb/TH_Thai_x.keyprop
 share/gnome/gkb/TR-f.keyprop
@@ -163,8 +192,12 @@ share/gnome/gkb/TR_Turkish_x.keyprop
 share/gnome/gkb/Thai.keyprop
 share/gnome/gkb/Thai2.keyprop
 share/gnome/gkb/UA_Ukrainian.keyprop
+share/gnome/gkb/UK-102.keyprop
 share/gnome/gkb/UK-x86.keyprop
 share/gnome/gkb/UK.keyprop
+share/gnome/gkb/UK_English.keyprop
+share/gnome/gkb/UK_English_x.keyprop
+share/gnome/gkb/UK_United_Kingdom.keyprop
 share/gnome/gkb/US-101.keyprop
 share/gnome/gkb/US-101A-x86.keyprop
 share/gnome/gkb/US-84.keyprop
@@ -179,21 +212,216 @@ share/gnome/gkb/US_English.keyprop
 share/gnome/gkb/US_international.keyprop
 share/gnome/gkb/VN_Vietnamese.keyprop
 share/gnome/gkb/YU_Serb_x.keyprop
+share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
 share/gnome/gkb/Yugoslav.keyprop
 share/gnome/gkb/presets.xml
+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/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-general.png
+${BATTSTAT}share/gnome/help/battstat/C/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/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/ja/figures/battstat-general.png
+${BATTSTAT}share/gnome/help/battstat/ja/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
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/C/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/de/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/de/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/es/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/fr/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/fr/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/it/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/it/legal.xml
+share/gnome/help/cdplayer/ja/cdplayer.xml
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/ja/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/ko/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/ko/legal.xml
+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_playing.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/sv/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/sv/legal.xml
+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_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_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_playing.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/zh_TW/legal.xml
 share/gnome/help/char-palette/C/char-palette.xml
-share/gnome/help/char-palette/C/figures/charpick_applet.png
+share/gnome/help/char-palette/C/figures/charpalette_applet.png
+share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/C/figures/charpick_characters.png
-share/gnome/help/char-palette/C/figures/charpick_chargroup.png
 share/gnome/help/char-palette/C/legal.xml
+share/gnome/help/char-palette/de/char-palette.xml
+share/gnome/help/char-palette/de/figures/charpalette_applet.png
+share/gnome/help/char-palette/de/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/de/figures/charpick_applet.png
+share/gnome/help/char-palette/de/figures/charpick_characters.png
+share/gnome/help/char-palette/de/figures/charpick_chargroup.png
+share/gnome/help/char-palette/de/legal.xml
+share/gnome/help/char-palette/es/char-palette.xml
+share/gnome/help/char-palette/es/figures/charpalette_applet.png
+share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/es/figures/charpick_applet.png
+share/gnome/help/char-palette/es/figures/charpick_characters.png
+share/gnome/help/char-palette/es/figures/charpick_chargroup.png
+share/gnome/help/char-palette/es/legal.xml
+share/gnome/help/char-palette/fr/char-palette.xml
+share/gnome/help/char-palette/fr/figures/charpalette_applet.png
+share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/fr/figures/charpick_applet.png
+share/gnome/help/char-palette/fr/figures/charpick_characters.png
+share/gnome/help/char-palette/fr/figures/charpick_chargroup.png
+share/gnome/help/char-palette/fr/legal.xml
+share/gnome/help/char-palette/it/char-palette.xml
+share/gnome/help/char-palette/it/figures/charpalette_applet.png
+share/gnome/help/char-palette/it/figures/charpalette_chargroup.png
+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
+share/gnome/help/char-palette/ko/figures/charpick_applet.png
+share/gnome/help/char-palette/ko/figures/charpick_characters.png
+share/gnome/help/char-palette/ko/figures/charpick_chargroup.png
+share/gnome/help/char-palette/ko/legal.xml
+share/gnome/help/char-palette/sv/char-palette.xml
+share/gnome/help/char-palette/sv/figures/charpalette_applet.png
+share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/sv/figures/charpick_applet.png
+share/gnome/help/char-palette/sv/figures/charpick_characters.png
+share/gnome/help/char-palette/sv/figures/charpick_chargroup.png
+share/gnome/help/char-palette/sv/legal.xml
+share/gnome/help/char-palette/zh_CN/char-palette.xml
+share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png
+share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png
+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_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
+share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png
+share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png
+share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png
+share/gnome/help/char-palette/zh_TW/legal.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/figures/command-line.png
 share/gnome/help/command-line/C/legal.xml
+share/gnome/help/command-line/de/command-line.xml
+share/gnome/help/command-line/de/figures/command-line.png
+share/gnome/help/command-line/de/legal.xml
+share/gnome/help/command-line/es/command-line.xml
+share/gnome/help/command-line/es/figures/command-line.png
+share/gnome/help/command-line/es/legal.xml
+share/gnome/help/command-line/fr/command-line.xml
+share/gnome/help/command-line/fr/figures/command-line.png
+share/gnome/help/command-line/fr/legal.xml
+share/gnome/help/command-line/it/command-line.xml
+share/gnome/help/command-line/it/figures/command-line.png
+share/gnome/help/command-line/it/legal.xml
+share/gnome/help/command-line/ja/command-line.xml
+share/gnome/help/command-line/ja/figures/command-line.png
+share/gnome/help/command-line/ja/legal.xml
+share/gnome/help/command-line/ko/command-line.xml
+share/gnome/help/command-line/ko/figures/command-line.png
+share/gnome/help/command-line/ko/legal.xml
+share/gnome/help/command-line/sv/command-line.xml
+share/gnome/help/command-line/sv/figures/command-line.png
+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_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_all.png
 share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
@@ -203,29 +431,275 @@ share/gnome/help/drivemount/C/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
-share/gnome/help/geyes/C/topic.dat
+share/gnome/help/geyes/de/figures/geyes_applet.png
+share/gnome/help/geyes/de/figures/geyes_settings.png
+share/gnome/help/geyes/de/geyes.xml
+share/gnome/help/geyes/de/legal.xml
+share/gnome/help/geyes/es/figures/geyes_applet.png
+share/gnome/help/geyes/es/figures/geyes_settings.png
+share/gnome/help/geyes/es/geyes.xml
+share/gnome/help/geyes/es/legal.xml
+share/gnome/help/geyes/fr/figures/geyes_applet.png
+share/gnome/help/geyes/fr/figures/geyes_settings.png
+share/gnome/help/geyes/fr/geyes.xml
+share/gnome/help/geyes/fr/legal.xml
+share/gnome/help/geyes/it/figures/geyes_applet.png
+share/gnome/help/geyes/it/figures/geyes_settings.png
+share/gnome/help/geyes/it/geyes.xml
+share/gnome/help/geyes/it/legal.xml
+share/gnome/help/geyes/ja/figures/geyes_applet.png
+share/gnome/help/geyes/ja/figures/geyes_settings.png
+share/gnome/help/geyes/ja/geyes.xml
+share/gnome/help/geyes/ja/legal.xml
+share/gnome/help/geyes/ko/figures/geyes_applet.png
+share/gnome/help/geyes/ko/figures/geyes_settings.png
+share/gnome/help/geyes/ko/geyes.xml
+share/gnome/help/geyes/ko/legal.xml
+share/gnome/help/geyes/sv/figures/geyes_applet.png
+share/gnome/help/geyes/sv/figures/geyes_settings.png
+share/gnome/help/geyes/sv/geyes.xml
+share/gnome/help/geyes/sv/legal.xml
+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_TW/figures/geyes_applet.png
+share/gnome/help/geyes/zh_TW/figures/geyes_settings.png
+share/gnome/help/geyes/zh_TW/geyes.xml
+share/gnome/help/geyes/zh_TW/legal.xml
 share/gnome/help/gkb/C/figures/gkb_applet.png
 share/gnome/help/gkb/C/gkb.xml
 share/gnome/help/gkb/C/legal.xml
+share/gnome/help/gkb/de/figures/gkb_applet.png
+share/gnome/help/gkb/de/gkb.xml
+share/gnome/help/gkb/de/legal.xml
+share/gnome/help/gkb/es/figures/gkb_applet.png
+share/gnome/help/gkb/es/gkb.xml
+share/gnome/help/gkb/es/legal.xml
+share/gnome/help/gkb/fr/figures/gkb_applet.png
+share/gnome/help/gkb/fr/gkb.xml
+share/gnome/help/gkb/fr/legal.xml
+share/gnome/help/gkb/it/figures/gkb_applet.png
+share/gnome/help/gkb/it/gkb.xml
+share/gnome/help/gkb/it/legal.xml
+share/gnome/help/gkb/ja/figures/gkb_applet.png
+share/gnome/help/gkb/ja/gkb.xml
+share/gnome/help/gkb/ja/legal.xml
+share/gnome/help/gkb/ko/figures/gkb_applet.png
+share/gnome/help/gkb/ko/gkb.xml
+share/gnome/help/gkb/ko/legal.xml
+share/gnome/help/gkb/sv/figures/gkb_applet.png
+share/gnome/help/gkb/sv/gkb.xml
+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_TW/figures/gkb_applet.png
+share/gnome/help/gkb/zh_TW/gkb.xml
+share/gnome/help/gkb/zh_TW/legal.xml
 share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
+share/gnome/help/gtik2_applet2/de/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/de/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/de/legal.xml
+share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/es/legal.xml
+share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/fr/legal.xml
+share/gnome/help/gtik2_applet2/it/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/it/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/it/legal.xml
+share/gnome/help/gtik2_applet2/ja/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/ja/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/ja/legal.xml
+share/gnome/help/gtik2_applet2/ko/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/ko/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/ko/legal.xml
+share/gnome/help/gtik2_applet2/sv/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/sv/gtik2_applet2.xml
+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_TW/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/zh_TW/legal.xml
 share/gnome/help/gweather/C/figures/gweather_applet.png
+share/gnome/help/gweather/C/figures/gweather_settings.png
+share/gnome/help/gweather/C/figures/gweather_weather.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
-share/gnome/help/gweather/C/topic.dat
+share/gnome/help/gweather/de/figures/gweather_applet.png
+share/gnome/help/gweather/de/figures/gweather_settings.png
+share/gnome/help/gweather/de/figures/gweather_weather.png
+share/gnome/help/gweather/de/gweather.xml
+share/gnome/help/gweather/de/legal.xml
+share/gnome/help/gweather/es/figures/gweather_applet.png
+share/gnome/help/gweather/es/figures/gweather_settings.png
+share/gnome/help/gweather/es/figures/gweather_weather.png
+share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/es/legal.xml
+share/gnome/help/gweather/fr/figures/gweather_applet.png
+share/gnome/help/gweather/fr/figures/gweather_settings.png
+share/gnome/help/gweather/fr/figures/gweather_weather.png
+share/gnome/help/gweather/fr/gweather.xml
+share/gnome/help/gweather/fr/legal.xml
+share/gnome/help/gweather/it/figures/gweather_applet.png
+share/gnome/help/gweather/it/figures/gweather_settings.png
+share/gnome/help/gweather/it/figures/gweather_weather.png
+share/gnome/help/gweather/it/gweather.xml
+share/gnome/help/gweather/it/legal.xml
+share/gnome/help/gweather/ja/figures/gweather_applet.png
+share/gnome/help/gweather/ja/figures/gweather_settings.png
+share/gnome/help/gweather/ja/figures/gweather_weather.png
+share/gnome/help/gweather/ja/gweather.xml
+share/gnome/help/gweather/ja/legal.xml
+share/gnome/help/gweather/ko/figures/gweather_applet.png
+share/gnome/help/gweather/ko/figures/gweather_settings.png
+share/gnome/help/gweather/ko/figures/gweather_weather.png
+share/gnome/help/gweather/ko/gweather.xml
+share/gnome/help/gweather/ko/legal.xml
+share/gnome/help/gweather/sv/figures/gweather_applet.png
+share/gnome/help/gweather/sv/figures/gweather_settings.png
+share/gnome/help/gweather/sv/figures/gweather_weather.png
+share/gnome/help/gweather/sv/gweather.xml
+share/gnome/help/gweather/sv/legal.xml
+share/gnome/help/gweather/zh_CN/figures/gweather_applet.png
+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_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
+share/gnome/help/gweather/zh_TW/gweather.xml
+share/gnome/help/gweather/zh_TW/legal.xml
+share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/C/legal.xml
+share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/mailcheck/de/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/de/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/de/legal.xml
+share/gnome/help/mailcheck/de/mailcheck.xml
+share/gnome/help/mailcheck/es/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/es/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/es/legal.xml
+share/gnome/help/mailcheck/es/mailcheck.xml
+share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/fr/legal.xml
+share/gnome/help/mailcheck/fr/mailcheck.xml
+share/gnome/help/mailcheck/it/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png
+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/mailcheck_applet.png
+share/gnome/help/mailcheck/ja/legal.xml
+share/gnome/help/mailcheck/ja/mailcheck.xml
+share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/ko/legal.xml
+share/gnome/help/mailcheck/ko/mailcheck.xml
+share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/sv/legal.xml
+share/gnome/help/mailcheck/sv/mailcheck.xml
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png
+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_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
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_TW/legal.xml
+share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
-share/gnome/help/mixer_applet2/C/topic.dat
+share/gnome/help/mixer_applet2/de/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/de/legal.xml
+share/gnome/help/mixer_applet2/de/mixer_applet2.xml
+share/gnome/help/mixer_applet2/es/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/es/legal.xml
+share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+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/ja/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ja/legal.xml
+share/gnome/help/mixer_applet2/ja/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ko/legal.xml
+share/gnome/help/mixer_applet2/ko/mixer_applet2.xml
+share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png
+share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/sv/legal.xml
+share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
+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_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
+share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml
+share/gnome/help/modemlights/C/figures/modemlights-advanced.png
+share/gnome/help/modemlights/C/figures/modemlights-advpref.png
+share/gnome/help/modemlights/C/figures/modemlights-color.png
+share/gnome/help/modemlights/C/figures/modemlights-general.png
+share/gnome/help/modemlights/C/figures/modemlights-prefs.png
+share/gnome/help/modemlights/C/figures/modemlights.png
+share/gnome/help/modemlights/C/figures/modemlights_applet.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_button.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_general.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png
+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/stickynotes_applet/C/legal.xml
+share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/wireless/C/legal.xml
+share/gnome/help/wireless/C/wireless.xml
 share/gweather/Locations
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
+${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
@@ -241,12 +715,14 @@ ${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/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
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
@@ -259,6 +735,8 @@ ${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/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/tr/LC_MESSAGES/gnome-applets-2.0.mo
@@ -267,15 +745,139 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 ${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-ja.omf
+share/omf/gnome-applets/cdplayer-C.omf
+share/omf/gnome-applets/cdplayer-de.omf
+share/omf/gnome-applets/cdplayer-es.omf
+share/omf/gnome-applets/cdplayer-fr.omf
+share/omf/gnome-applets/cdplayer-it.omf
+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_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_TW.omf
 share/omf/gnome-applets/command-line-C.omf
+share/omf/gnome-applets/command-line-de.omf
+share/omf/gnome-applets/command-line-es.omf
+share/omf/gnome-applets/command-line-fr.omf
+share/omf/gnome-applets/command-line-it.omf
+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_TW.omf
 share/omf/gnome-applets/drivemount-C.omf
 share/omf/gnome-applets/geyes-C.omf
+share/omf/gnome-applets/geyes-de.omf
+share/omf/gnome-applets/geyes-es.omf
+share/omf/gnome-applets/geyes-fr.omf
+share/omf/gnome-applets/geyes-it.omf
+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_TW.omf
 share/omf/gnome-applets/gkb-C.omf
+share/omf/gnome-applets/gkb-de.omf
+share/omf/gnome-applets/gkb-es.omf
+share/omf/gnome-applets/gkb-fr.omf
+share/omf/gnome-applets/gkb-it.omf
+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_TW.omf
 share/omf/gnome-applets/gtik2_applet2-C.omf
+share/omf/gnome-applets/gtik2_applet2-de.omf
+share/omf/gnome-applets/gtik2_applet2-es.omf
+share/omf/gnome-applets/gtik2_applet2-fr.omf
+share/omf/gnome-applets/gtik2_applet2-it.omf
+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_TW.omf
 share/omf/gnome-applets/gweather-C.omf
+share/omf/gnome-applets/gweather-de.omf
+share/omf/gnome-applets/gweather-es.omf
+share/omf/gnome-applets/gweather-fr.omf
+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_TW.omf
+share/omf/gnome-applets/gweather_applet-it.omf
+share/omf/gnome-applets/mailcheck-C.omf
+share/omf/gnome-applets/mailcheck-de.omf
+share/omf/gnome-applets/mailcheck-es.omf
+share/omf/gnome-applets/mailcheck-fr.omf
+share/omf/gnome-applets/mailcheck-it.omf
+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_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-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_TW.omf
+share/omf/gnome-applets/modemlights-C.omf
+share/omf/gnome-applets/stickynotes_applet-C.omf
+share/omf/gnome-applets/wireless-C.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
+share/pixmaps/accessx-status-applet/ax-key-inverse.png
+share/pixmaps/accessx-status-applet/ax-key-no.png
+share/pixmaps/accessx-status-applet/ax-key-none.png
+share/pixmaps/accessx-status-applet/ax-key-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-no.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-pending.png
+share/pixmaps/accessx-status-applet/ax-slowkeys-yes.png
+share/pixmaps/accessx-status-applet/ax-slowkeys.png
+share/pixmaps/accessx-status-applet/mousekeys-base.png
+share/pixmaps/accessx-status-applet/mousekeys-default-left.png
+share/pixmaps/accessx-status-applet/mousekeys-default-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-default-right.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-left.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-middle.png
+share/pixmaps/accessx-status-applet/mousekeys-pressed-right.png
+share/pixmaps/accessx-status-applet/sticky-alt-latched.png
+share/pixmaps/accessx-status-applet/sticky-alt-locked.png
+share/pixmaps/accessx-status-applet/sticky-alt-none.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-latched.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-locked.png
+share/pixmaps/accessx-status-applet/sticky-ctrl-none.png
+share/pixmaps/accessx-status-applet/sticky-hyper-latched.png
+share/pixmaps/accessx-status-applet/sticky-hyper-locked.png
+share/pixmaps/accessx-status-applet/sticky-hyper-none.png
+share/pixmaps/accessx-status-applet/sticky-meta-latched.png
+share/pixmaps/accessx-status-applet/sticky-meta-locked.png
+share/pixmaps/accessx-status-applet/sticky-meta-none.png
+share/pixmaps/accessx-status-applet/sticky-shift-latched.png
+share/pixmaps/accessx-status-applet/sticky-shift-locked.png
+share/pixmaps/accessx-status-applet/sticky-shift-none.png
+share/pixmaps/accessx-status-applet/sticky-super-latched.png
+share/pixmaps/accessx-status-applet/sticky-super-locked.png
+share/pixmaps/accessx-status-applet/sticky-super-none.png
+${BATTSTAT}share/pixmaps/battstat.png
 share/pixmaps/charpick.png
 share/pixmaps/drivemount-applet.png
 share/pixmaps/gkb-icon.png
@@ -292,7 +894,6 @@ share/pixmaps/gkb/br.png
 share/pixmaps/gkb/by.png
 share/pixmaps/gkb/ca.png
 share/pixmaps/gkb/ch.png
-share/pixmaps/gkb/cs.png
 share/pixmaps/gkb/cu.png
 share/pixmaps/gkb/cz.png
 share/pixmaps/gkb/de.png
@@ -305,7 +906,6 @@ share/pixmaps/gkb/es.png
 share/pixmaps/gkb/eu.png
 share/pixmaps/gkb/fi.png
 share/pixmaps/gkb/fr.png
-share/pixmaps/gkb/gb.png
 share/pixmaps/gkb/ge.png
 share/pixmaps/gkb/gkb.png
 share/pixmaps/gkb/gr.png
@@ -327,6 +927,7 @@ share/pixmaps/gkb/lt.png
 share/pixmaps/gkb/ly.png
 share/pixmaps/gkb/ma.png
 share/pixmaps/gkb/mk.png
+share/pixmaps/gkb/mn.png
 share/pixmaps/gkb/mx.png
 share/pixmaps/gkb/nl.png
 share/pixmaps/gkb/no.png
@@ -339,13 +940,12 @@ share/pixmaps/gkb/qc.png
 share/pixmaps/gkb/ro.png
 share/pixmaps/gkb/ru.png
 share/pixmaps/gkb/sa.png
+share/pixmaps/gkb/sd.png
 share/pixmaps/gkb/se.png
 share/pixmaps/gkb/si.png
 share/pixmaps/gkb/sk.png
 share/pixmaps/gkb/so.png
 share/pixmaps/gkb/sr.png
-share/pixmaps/gkb/su.png
-share/pixmaps/gkb/sv.png
 share/pixmaps/gkb/sy.png
 share/pixmaps/gkb/th.png
 share/pixmaps/gkb/tn.png
@@ -358,10 +958,17 @@ 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/mailcheck/eclouds.png
+share/pixmaps/mailcheck/email-e.png
+share/pixmaps/mailcheck/email-eclouds.png
+share/pixmaps/mailcheck/email-tiny.png
+share/pixmaps/mailcheck/email.png
+share/pixmaps/mailcheck/tux-anim.png
 share/pixmaps/mini-commander/browser-mini.xpm
 share/pixmaps/mini-commander/history-mini.xpm
 share/pixmaps/mixer/gnome-mixer-applet.png
@@ -370,6 +977,13 @@ share/pixmaps/mixer/volume-medium.png
 share/pixmaps/mixer/volume-min.png
 share/pixmaps/mixer/volume-mute.png
 share/pixmaps/mixer/volume-zero.png
+share/pixmaps/stickynotes/close.png
+share/pixmaps/stickynotes/locked.png
+share/pixmaps/stickynotes/resize_se.png
+share/pixmaps/stickynotes/resize_sw.png
+share/pixmaps/stickynotes/stickynotes.png
+share/pixmaps/stickynotes/stickynotes_prelight.png
+share/pixmaps/stickynotes/unlocked.png
 share/pixmaps/wireless-applet/broken-0.png
 share/pixmaps/wireless-applet/no-link-0.png
 share/pixmaps/wireless-applet/signal-1-40.png
@@ -377,6 +991,7 @@ share/pixmaps/wireless-applet/signal-41-60.png
 share/pixmaps/wireless-applet/signal-61-80.png
 share/pixmaps/wireless-applet/signal-81-100.png
 share/pixmaps/wireless-applet/wireless-applet.png
+share/stickynotes/stickynotes.glade
 share/wireless-applet/wireless-applet.glade
 share/xmodmap/xmodmap.am
 share/xmodmap/xmodmap.ar
@@ -424,6 +1039,10 @@ share/xmodmap/xmodmap.lt
 share/xmodmap/xmodmap.lt_b
 share/xmodmap/xmodmap.lt_p
 share/xmodmap/xmodmap.mk
+share/xmodmap/xmodmap.mn
+share/xmodmap/xmodmap.mn-phonet
+share/xmodmap/xmodmap.mn-rev
+share/xmodmap/xmodmap.mn-uni
 share/xmodmap/xmodmap.nl
 share/xmodmap/xmodmap.no
 share/xmodmap/xmodmap.pl
@@ -461,44 +1080,238 @@ share/xmodmap/xmodmap.us_intl
 share/xmodmap/xmodmap.yu
 @dirrm share/xmodmap
 @dirrm share/wireless-applet
+@dirrm share/stickynotes
 @dirrm share/pixmaps/wireless-applet
+@dirrm share/pixmaps/stickynotes
 @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
 @dirrm share/omf/gnome-applets
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gweather
+@dirrm share/gnome/help/wireless/C
+@dirrm share/gnome/help/wireless
+@dirrm share/gnome/help/stickynotes_applet/C
+@dirrm share/gnome/help/stickynotes_applet
+@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_CN/figures
+@dirrm share/gnome/help/mixer_applet2/zh_CN
+@dirrm share/gnome/help/mixer_applet2/sv/figures
+@dirrm share/gnome/help/mixer_applet2/sv
+@dirrm share/gnome/help/mixer_applet2/ko/figures
+@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/fr/figures
+@dirrm share/gnome/help/mixer_applet2/fr
+@dirrm share/gnome/help/mixer_applet2/es/figures
+@dirrm share/gnome/help/mixer_applet2/es
+@dirrm share/gnome/help/mixer_applet2/de/figures
+@dirrm share/gnome/help/mixer_applet2/de
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @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_CN/figures
+@dirrm share/gnome/help/mailcheck/zh_CN
+@dirrm share/gnome/help/mailcheck/sv/figures
+@dirrm share/gnome/help/mailcheck/sv
+@dirrm share/gnome/help/mailcheck/ko/figures
+@dirrm share/gnome/help/mailcheck/ko
+@dirrm share/gnome/help/mailcheck/ja/figures
+@dirrm share/gnome/help/mailcheck/ja
+@dirrm share/gnome/help/mailcheck/it/figures
+@dirrm share/gnome/help/mailcheck/it
+@dirrm share/gnome/help/mailcheck/fr/figures
+@dirrm share/gnome/help/mailcheck/fr
+@dirrm share/gnome/help/mailcheck/es/figures
+@dirrm share/gnome/help/mailcheck/es
+@dirrm share/gnome/help/mailcheck/de/figures
+@dirrm share/gnome/help/mailcheck/de
+@dirrm share/gnome/help/mailcheck/C/figures
+@dirrm share/gnome/help/mailcheck/C
+@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_CN/figures
+@dirrm share/gnome/help/gweather/zh_CN
+@dirrm share/gnome/help/gweather/sv/figures
+@dirrm share/gnome/help/gweather/sv
+@dirrm share/gnome/help/gweather/ko/figures
+@dirrm share/gnome/help/gweather/ko
+@dirrm share/gnome/help/gweather/ja/figures
+@dirrm share/gnome/help/gweather/ja
+@dirrm share/gnome/help/gweather/it/figures
+@dirrm share/gnome/help/gweather/it
+@dirrm share/gnome/help/gweather/fr/figures
+@dirrm share/gnome/help/gweather/fr
+@dirrm share/gnome/help/gweather/es/figures
+@dirrm share/gnome/help/gweather/es
+@dirrm share/gnome/help/gweather/de/figures
+@dirrm share/gnome/help/gweather/de
 @dirrm share/gnome/help/gweather/C/figures
 @dirrm share/gnome/help/gweather/C
 @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_CN/figures
+@dirrm share/gnome/help/gtik2_applet2/zh_CN
+@dirrm share/gnome/help/gtik2_applet2/sv/figures
+@dirrm share/gnome/help/gtik2_applet2/sv
+@dirrm share/gnome/help/gtik2_applet2/ko/figures
+@dirrm share/gnome/help/gtik2_applet2/ko
+@dirrm share/gnome/help/gtik2_applet2/ja/figures
+@dirrm share/gnome/help/gtik2_applet2/ja
+@dirrm share/gnome/help/gtik2_applet2/it/figures
+@dirrm share/gnome/help/gtik2_applet2/it
+@dirrm share/gnome/help/gtik2_applet2/fr/figures
+@dirrm share/gnome/help/gtik2_applet2/fr
+@dirrm share/gnome/help/gtik2_applet2/es/figures
+@dirrm share/gnome/help/gtik2_applet2/es
+@dirrm share/gnome/help/gtik2_applet2/de/figures
+@dirrm share/gnome/help/gtik2_applet2/de
 @dirrm share/gnome/help/gtik2_applet2/C/figures
 @dirrm share/gnome/help/gtik2_applet2/C
 @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_CN/figures
+@dirrm share/gnome/help/gkb/zh_CN
+@dirrm share/gnome/help/gkb/sv/figures
+@dirrm share/gnome/help/gkb/sv
+@dirrm share/gnome/help/gkb/ko/figures
+@dirrm share/gnome/help/gkb/ko
+@dirrm share/gnome/help/gkb/ja/figures
+@dirrm share/gnome/help/gkb/ja
+@dirrm share/gnome/help/gkb/it/figures
+@dirrm share/gnome/help/gkb/it
+@dirrm share/gnome/help/gkb/fr/figures
+@dirrm share/gnome/help/gkb/fr
+@dirrm share/gnome/help/gkb/es/figures
+@dirrm share/gnome/help/gkb/es
+@dirrm share/gnome/help/gkb/de/figures
+@dirrm share/gnome/help/gkb/de
 @dirrm share/gnome/help/gkb/C/figures
 @dirrm share/gnome/help/gkb/C
 @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_CN/figures
+@dirrm share/gnome/help/geyes/zh_CN
+@dirrm share/gnome/help/geyes/sv/figures
+@dirrm share/gnome/help/geyes/sv
+@dirrm share/gnome/help/geyes/ko/figures
+@dirrm share/gnome/help/geyes/ko
+@dirrm share/gnome/help/geyes/ja/figures
+@dirrm share/gnome/help/geyes/ja
+@dirrm share/gnome/help/geyes/it/figures
+@dirrm share/gnome/help/geyes/it
+@dirrm share/gnome/help/geyes/fr/figures
+@dirrm share/gnome/help/geyes/fr
+@dirrm share/gnome/help/geyes/es/figures
+@dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/de/figures
+@dirrm share/gnome/help/geyes/de
 @dirrm share/gnome/help/geyes/C/figures
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
 @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_CN/figures
+@dirrm share/gnome/help/command-line/zh_CN
+@dirrm share/gnome/help/command-line/sv/figures
+@dirrm share/gnome/help/command-line/sv
+@dirrm share/gnome/help/command-line/ko/figures
+@dirrm share/gnome/help/command-line/ko
+@dirrm share/gnome/help/command-line/ja/figures
+@dirrm share/gnome/help/command-line/ja
+@dirrm share/gnome/help/command-line/it/figures
+@dirrm share/gnome/help/command-line/it
+@dirrm share/gnome/help/command-line/fr/figures
+@dirrm share/gnome/help/command-line/fr
+@dirrm share/gnome/help/command-line/es/figures
+@dirrm share/gnome/help/command-line/es
+@dirrm share/gnome/help/command-line/de/figures
+@dirrm share/gnome/help/command-line/de
 @dirrm share/gnome/help/command-line/C/figures
 @dirrm share/gnome/help/command-line/C
 @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_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
+@dirrm share/gnome/help/char-palette/fr
+@dirrm share/gnome/help/char-palette/es/figures
+@dirrm share/gnome/help/char-palette/es
+@dirrm share/gnome/help/char-palette/de/figures
+@dirrm share/gnome/help/char-palette/de
 @dirrm share/gnome/help/char-palette/C/figures
 @dirrm share/gnome/help/char-palette/C
 @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_CN/figures
+@dirrm share/gnome/help/cdplayer/zh_CN
+@dirrm share/gnome/help/cdplayer/sv/figures
+@dirrm share/gnome/help/cdplayer/sv
+@dirrm share/gnome/help/cdplayer/ko/figures
+@dirrm share/gnome/help/cdplayer/ko
+@dirrm share/gnome/help/cdplayer/ja/figures
+@dirrm share/gnome/help/cdplayer/ja
+@dirrm share/gnome/help/cdplayer/it/figures
+@dirrm share/gnome/help/cdplayer/it
+@dirrm share/gnome/help/cdplayer/fr/figures
+@dirrm share/gnome/help/cdplayer/fr
+@dirrm share/gnome/help/cdplayer/es/figures
+@dirrm share/gnome/help/cdplayer/es
+@dirrm share/gnome/help/cdplayer/de/figures
+@dirrm share/gnome/help/cdplayer/de
+@dirrm share/gnome/help/cdplayer/C/figures
+@dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer
+${BATTSTAT}@dirrm share/gnome/help/battstat/ja/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/ja
+${BATTSTAT}@dirrm share/gnome/help/battstat/C/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/C
+${BATTSTAT}@dirrm share/gnome/help/battstat
+@dirrm share/gnome/help/accessx-status/C/figures
+@dirrm share/gnome/help/accessx-status/C
+@dirrm share/gnome/help/accessx-status
+@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
 @dirrm share/geyes/Horrid
 @dirrm share/geyes/Default-tiny
 @dirrm share/geyes/Default
 @dirrm share/geyes/Bloodshot
 @dirrm share/geyes/Bizarre
 @dirrm share/geyes
+@dirrm share/gen_util
+@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
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index 6e2b631b57b..8f393cfd861 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/20 23:19:24 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
 
-SHA1 (gnome-applets-2.2.1.tar.bz2) = b302bc12fa9537b0384e611b22cbd1a715465ef3
-Size (gnome-applets-2.2.1.tar.bz2) = 2019602 bytes
-SHA1 (patch-aa) = 98bcdd2c535c6a9da4d59addfbc5a8035a5384bf
-SHA1 (patch-ab) = a114b55cd139b988545760aa528a2cca42a64e33
+SHA1 (gnome-applets-2.4.1.tar.bz2) = 2427cff71e223f8b0a82e9831d623677c33633f3
+Size (gnome-applets-2.4.1.tar.bz2) = 4022786 bytes
+SHA1 (patch-aa) = 129c94a7b7614414be5f471789ab294829f2385c
+SHA1 (patch-ab) = 32dc492dd3502fed95b26ee2f9a572d462a84e29
+SHA1 (patch-ac) = b5a1b8da7bd30fae2d47ddf8e391087fea59d7b6
+SHA1 (patch-ad) = 24ab88d442f3f974d67b8d48bce0e9934743be05
+SHA1 (patch-ae) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
+SHA1 (patch-af) = 9532d2e30a375efc22194e92347b67aa876fee8e
diff --git a/x11/gnome2-applets/files/install.tmpl b/x11/gnome2-applets/files/install.tmpl
new file mode 100644
index 00000000000..f78ec5e42cb
--- /dev/null
+++ b/x11/gnome2-applets/files/install.tmpl
@@ -0,0 +1,13 @@
+# $NetBSD: install.tmpl,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
+#
+# Set default list of macros.
+#
+
+case ${STAGE} in
+POST-INSTALL)
+	GCONF_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" \
+		${LOCALBASE}/libexec/gnome-applets/mc-install-default-macros
+	;;
+*)
+	;;
+esac
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome2-applets/patches/patch-aa
index 8f4adcb6e68..9b77702fbce 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome2-applets/patches/patch-aa
@@ -1,21 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/20 23:19:24 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
 
---- configure.orig	2003-03-11 03:45:40.000000000 +1000
-+++ configure
-@@ -11202,7 +11202,6 @@ cdplayer_type_sun=false
- case "$host" in
- *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
- *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
--*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
- *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
- esac
- case "$host" in
-@@ -11339,7 +11338,7 @@ else
- fi
+--- charpick/charpick.c.orig	2003-10-26 20:07:40.000000000 +0000
++++ charpick/charpick.c	2003-10-26 20:08:17.000000000 +0000
+@@ -3,7 +3,7 @@
+  */
  
- 	;;
--  *solaris*)
-+  *)
- 	build_battstat_applet=no
- 	;;
- esac
+ #include <config.h>
+-#ifndef sun
++#ifdef __Linux__
+   #include <tgmath.h>
+ #endif
+ #include <panel-applet.h>
diff --git a/x11/gnome2-applets/patches/patch-ab b/x11/gnome2-applets/patches/patch-ab
index 705a2c0549a..22c432ac8ce 100644
--- a/x11/gnome2-applets/patches/patch-ab
+++ b/x11/gnome2-applets/patches/patch-ab
@@ -1,15 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/20 23:19:24 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
 
---- mini-commander/src/mc-install-default-macros.c.orig	2003-03-11 03:45:54.000000000 +1000
-+++ mini-commander/src/mc-install-default-macros.c
-@@ -67,8 +67,8 @@ install_default_macros_list (GConfClient
- 
- 	error = NULL;
- 	schema = gconf_client_get_schema (client, key, &error);
--	if (error) {
--		g_warning (_("Cannot get schema for %s : %s"), key, error->message);
-+	if (error || !schema) {
-+		g_warning (_("Cannot get schema for %s : %s"), key, error ? error->message : _("unknown error"));
- 		g_error_free (error);
- 		return;
- 	}
+--- configure.orig	2003-10-26 20:27:25.000000000 +0000
++++ configure	2003-10-26 20:29:06.000000000 +0000
+@@ -22265,7 +22265,8 @@
+ case "$host" in
+ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
+ *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
+-*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
++*freebsd*) CDROM_HOST=bsd;cd_device_path="/dev/acd0";;
++*netbsd*|*openbsd*) CDROM_HOST=bsd;cd_device_path="/dev/rcd0d";;
+ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
+ esac
+ case "$host" in
diff --git a/x11/gnome2-applets/patches/patch-ac b/x11/gnome2-applets/patches/patch-ac
new file mode 100644
index 00000000000..7efe1438d4f
--- /dev/null
+++ b/x11/gnome2-applets/patches/patch-ac
@@ -0,0 +1,352 @@
+$NetBSD: patch-ac,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
+
+--- /dev/null	2003-10-26 20:58:41.000000000 +0000
++++ cdplayer/cdrom-bsd.c	2003-10-26 20:58:37.000000000 +0000
+@@ -0,0 +1,347 @@
++#include <stdlib.h>
++#include <string.h>
++#include <fcntl.h>
++#include <glib.h>
++#include <sys/ioctl.h>
++#include <unistd.h>
++
++#include <sys/types.h>
++#include <sys/cdio.h>
++#include "cdrom-interface.h"
++
++#define ASSIGN_MSF(dest, src) \
++{ \
++  (dest).minute = (src).minute; \
++  (dest).second = (src).second; \
++  (dest).frame = (src).frame; \
++}
++
++int
++cdrom_play(cdrom_device_t cdp, int start, int stop)
++{
++	struct ioc_play_track ti;
++
++	ti.start_track = start;
++	ti.start_index = 1;
++	ti.end_track = stop;
++	ti.end_index = 1;
++
++	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
++	    (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++int
++cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
++{
++	struct ioc_play_msf msf;
++
++	if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
++		return DISC_IO_ERROR;
++	msf.start_m = start->minute;
++	msf.start_s = start->second;
++	msf.start_f = start->frame;
++
++	msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
++	msf.end_s = cdp->track_info[cdp->nr_track].address.second;
++	msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
++
++	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
++	    (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++int
++cdrom_pause(cdrom_device_t cdp)
++{
++	if (ioctl(cdp->device, CDIOCPAUSE) == -1) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	return DISC_IO_ERROR;
++}
++
++int
++cdrom_resume(cdrom_device_t cdp)
++{
++	if (ioctl(cdp->device, CDIOCRESUME) == -1) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++
++int
++cdrom_stop(cdrom_device_t cdp)
++{
++	if ((ioctl(cdp->device, CDIOCSTOP) == -1) ||
++	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
++		cdp->my_errno = errno;
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++int
++cdrom_read_track_info(cdrom_device_t cdp)
++{
++	struct ioc_toc_header toc;
++#ifdef __FreeBSD__
++	struct ioc_read_toc_single_entry tocentry;
++#else
++	struct ioc_read_toc_entry tocentry;
++#endif
++	int i, j, nr_track;
++
++	if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	cdp->track0 = toc.starting_track;
++	cdp->track1 = toc.ending_track;
++	nr_track = cdp->track1 - cdp->track0;
++	if (nr_track <= 0)
++		return DISC_IO_ERROR;
++
++	if (nr_track != cdp->nr_track) {
++		if (cdp->track_info)
++			g_free(cdp->track_info);
++		cdp->nr_track = nr_track;
++		cdp->track_info = g_malloc((cdp->nr_track) * sizeof(track_info_t));
++	}
++	for (i = 0, j = cdp->track0; i < cdp->nr_track; i, j) {
++		tocentry.starting_track = j;
++		tocentry.address_format = CD_MSF_FORMAT;
++
++#ifdef __FreeBSD__
++		if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
++#else
++		if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
++#endif
++			cdp->my_errno = errno;
++			ioctl(cdp->device, CDIOCALLOW);
++			return DISC_IO_ERROR;
++		}
++		/* fill the trackinfo field */
++		cdp->track_info[i].track = j;
++		cdp->track_info[i].audio_track = tocentry.data->control !=
++		    0x04 ? 1 : 0;
++		ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
++	}
++
++	tocentry.starting_track = 0xAA;
++	tocentry.address_format = CD_MSF_FORMAT;
++#ifdef __FreeBSD__
++	if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
++#else
++	if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
++#endif
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	cdp->track_info[i].track = j;
++	cdp->track_info[i].audio_track = 0;
++	ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
++
++	return DISC_NO_ERROR;
++}
++
++int
++cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat)
++{
++	struct ioc_read_subchannel subchnl;
++	struct cd_sub_channel_info subchnlinfo;
++	
++	subchnl.address_format = CD_MSF_FORMAT;
++	subchnl.data_format = CD_CURRENT_POSITION;
++	subchnl.track = 0;
++	subchnl.data_len = sizeof(subchnlinfo);
++	subchnl.data = &subchnlinfo;
++	if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) {
++		cdp->my_errno = errno;
++		ioctl(cdp->device, CDIOCALLOW);
++		return DISC_IO_ERROR;
++	}
++	stat->track = subchnlinfo.what.position.track_number;
++     	ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf);
++     	ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf);
++	switch (subchnlinfo.header.audio_status) {
++	case CD_AS_PLAY_IN_PROGRESS:
++		ioctl(cdp->device, CDIOCPREVENT);
++		stat->audio_status = DISC_PLAY;
++		break;
++	case CD_AS_PLAY_PAUSED:
++		ioctl(cdp->device, CDIOCPREVENT);
++		stat->audio_status = DISC_PAUSED;
++		break;
++	case CD_AS_PLAY_COMPLETED:
++		if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
++			return DISC_IO_ERROR;
++		stat->track = cdp->nr_track;
++	     	ASSIGN_MSF(stat->relative_address, 
++		     		cdp->track_info[cdp->nr_track].address);
++	     	ASSIGN_MSF(stat->absolute_address,
++		     		cdp->track_info[cdp->nr_track].address);
++		ioctl(cdp->device, CDIOCALLOW);
++		stat->audio_status = DISC_COMPLETED;
++		break;
++	case CD_AS_AUDIO_INVALID:
++	case CD_AS_NO_STATUS:
++	case CD_AS_PLAY_ERROR:
++		ioctl(cdp->device, CDIOCALLOW);
++		stat->audio_status = DISC_STOP;
++		break;
++	default:
++		ioctl(cdp->device, CDIOCALLOW);
++		stat->audio_status = DISC_ERROR;
++	}
++	return (stat->audio_status == DISC_ERROR ?
++			DISC_IO_ERROR : DISC_NO_ERROR);
++}
++
++cdrom_device_t
++cdrom_open(char *device, int *errcode)
++{
++	cdrom_device_t cdp;
++
++	cdp = g_malloc(sizeof(struct cdrom_device));
++
++	cdp->device = open(device, O_RDONLY);
++	if (cdp->device == -1) {
++		*errcode = errno;
++		g_free(cdp);
++		return NULL;
++	}
++	cdp->nr_track = 0;
++	cdp->track_info = NULL;
++	return cdp;
++}
++
++void
++cdrom_close(cdrom_device_t cdp)
++{
++	if (cdp->nr_track)
++		g_free(cdp->track_info);
++	close(cdp->device);
++	g_free(cdp);
++}
++
++int
++cdrom_load(cdrom_device_t cdp)
++{
++	if ((ioctl(cdp->device, CDIOCCLOSE) == -1) ||
++	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
++		cdp->my_errno = errno;
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++int
++cdrom_eject(cdrom_device_t cdp)
++{
++	if ((ioctl(cdp->device, CDIOCEJECT) == -1) ||
++	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
++		cdp->my_errno = errno;
++		return DISC_IO_ERROR;
++	}
++	return DISC_NO_ERROR;
++}
++
++int 
++cdrom_next(cdrom_device_t cdp)
++{
++	cdrom_device_status_t stat;
++
++	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++		return DISC_IO_ERROR;
++	return cdrom_play(cdp, stat.track, cdp->track1);
++}
++
++int 
++cdrom_prev(cdrom_device_t cdp)
++{
++	cdrom_device_status_t stat;
++
++	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++		return DISC_IO_ERROR;
++	return cdrom_play(cdp, stat.track - 1, cdp->track1);
++}
++
++int
++cdrom_rewind(cdrom_device_t cdp)
++{
++	cdrom_device_status_t stat;
++	int track;
++
++	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++		return DISC_IO_ERROR;
++	if (stat.absolute_address.second != 0)
++		stat.absolute_address.second--;
++	else {
++		stat.absolute_address.second = 0;
++		if (stat.absolute_address.minute > 0)
++			stat.absolute_address.minute--;
++	}
++	stat.absolute_address.frame = 0;
++	return cdrom_play_msf(cdp, &stat.absolute_address);
++}
++
++int
++cdrom_ff(cdrom_device_t cdp)
++{
++	cdrom_device_status_t stat;
++	int track;
++
++	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
++	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
++		return DISC_IO_ERROR;
++	stat.absolute_address.second;
++	if (stat.absolute_address.second >= 60) {
++		stat.absolute_address.minute;
++		stat.absolute_address.second = 0;
++	}
++	stat.absolute_address.frame = 0;
++	return cdrom_play_msf(cdp, &stat.absolute_address);
++}
++
++int
++cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length)
++{
++	int index, s1, s2, i;
++
++	if ((track < cdp->track0) || (track > cdp->track1))
++		return DISC_INDEX_OUT_OF_RANGE;
++	index = track - cdp->track0;
++
++	s1 = cdp->track_info[index].address.second;
++	s2 = cdp->track_info[index].address.second;
++	length->second = s1 = s1 - s2;
++	if (s1 < 0) {
++		i = 1;
++		length->second = s1;
++	} else
++		i = 0;
++
++	length->minute = cdp->track_info[index].address.minute -
++	    cdp->track_info[index].address.minute - i;
++
++	return 0;
++}
++
diff --git a/x11/gnome2-applets/patches/patch-ad b/x11/gnome2-applets/patches/patch-ad
new file mode 100644
index 00000000000..17d77e2aa66
--- /dev/null
+++ b/x11/gnome2-applets/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
+
+--- mini-commander/src/Makefile.in.orig	2003-12-12 11:35:41.000000000 -0600
++++ mini-commander/src/Makefile.in
+@@ -646,7 +646,7 @@ $(server_in_files): $(server_in_files:.s
+ 
+ install-data-local:
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA) ;
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
++#	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
diff --git a/x11/gnome2-applets/patches/patch-ae b/x11/gnome2-applets/patches/patch-ae
new file mode 100644
index 00000000000..51cc82e8296
--- /dev/null
+++ b/x11/gnome2-applets/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
+
+--- battstat/sounds/Makefile.in.orig	2003-12-13 15:42:24.000000000 -0600
++++ battstat/sounds/Makefile.in
+@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ X_LIBS = @X_LIBS@
+ gnomelocaledir = @gnomelocaledir@
+ 
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = battstat_applet.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+ 
diff --git a/x11/gnome2-applets/patches/patch-af b/x11/gnome2-applets/patches/patch-af
new file mode 100644
index 00000000000..61e6f89be15
--- /dev/null
+++ b/x11/gnome2-applets/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
+
+--- mailcheck/Makefile.in.orig	2003-12-13 15:40:45.000000000 -0600
++++ mailcheck/Makefile.in
+@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
+ mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
+ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
+ 
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = mailcheck.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+