update to 2.20.0

This switches to the new gnome-2.20 branch.

6 files changed, 143 insertions, 177 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 568c6b55a81..26ff3eb6145 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:29 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/11/05 19:23:31 drochner Exp $
 #
 
-DISTNAME=		gnome-applets-2.18.0
-PKGREVISION=		7
+DISTNAME=		gnome-applets-2.20.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -105,7 +104,7 @@ PYTHON_PATCH_SCRIPTS+=	invest-applet/invest/invest-chart
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/control-center/buildlink3.mk"
+.include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST
index 9393a51dc48..eec66ee056e 100644
--- a/x11/gnome-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/09/25 10:54:22 hira Exp $
-${CPUFREQ}bin/cpufreq-selector
+@comment $NetBSD: PLIST,v 1.11 2007/11/05 19:23:31 drochner Exp $
 bin/invest-chart
 include/libgweather/gweather-gconf.h
 include/libgweather/gweather-prefs.h
@@ -7,7 +6,6 @@ include/libgweather/weather.h
 lib/bonobo/servers/GNOME_AccessxStatusApplet.server
 ${BATTSTAT}lib/bonobo/servers/GNOME_BattstatApplet.server
 lib/bonobo/servers/GNOME_CDPlayerApplet.server
-${CPUFREQ}lib/bonobo/servers/GNOME_CPUFreqApplet.server
 lib/bonobo/servers/GNOME_CharpickerApplet.server
 lib/bonobo/servers/GNOME_DriveMountApplet.server
 lib/bonobo/servers/GNOME_GWeatherApplet_Factory.server
@@ -51,7 +49,6 @@ ${PYSITELIB}/invest/widgets.pyo
 libexec/accessx-status-applet
 ${BATTSTAT}libexec/battstat-applet-2
 libexec/charpick_applet2
-${CPUFREQ}libexec/cpufreq-applet
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gweather-applet-2
@@ -61,11 +58,9 @@ libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
-share/applications/invest-chart.desktop
 ${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist
 ${BATTSTAT}share/gconf/schemas/battstat.schemas
 share/gconf/schemas/charpick.schemas
-${CPUFREQ}share/gconf/schemas/cpufreq-applet.schemas
 share/gconf/schemas/drivemount.schemas
 share/gconf/schemas/geyes.schemas
 share/gconf/schemas/gweather.schemas
@@ -75,7 +70,6 @@ share/gconf/schemas/stickynotes.schemas
 share/gnome-2.0/ui/GNOME_AccessxApplet.xml
 ${BATTSTAT}share/gnome-2.0/ui/GNOME_BattstatApplet.xml
 share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-${CPUFREQ}share/gnome-2.0/ui/GNOME_CPUFreqApplet.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
@@ -103,7 +97,6 @@ share/gnome-applets/geyes/Tango/config
 share/gnome-applets/geyes/Tango/tango-eye.png
 share/gnome-applets/geyes/Tango/tango-pupil.png
 ${BATTSTAT}share/gnome-applets/glade/battstat_applet.glade
-${CPUFREQ}share/gnome-applets/glade/cpufreq-preferences.glade
 share/gnome-applets/glade/financialchart.glade
 share/gnome-applets/glade/prefs-dialog.glade
 share/gnome-applets/glade/stickynotes.glade
@@ -138,6 +131,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/ca/accessx-status.xml
+share/gnome/help/accessx-status/ca/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/ca/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/ca/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/en_GB/accessx-status.xml
 share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
@@ -198,6 +203,18 @@ share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/oc/accessx-status.xml
+share/gnome/help/accessx-status/oc/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/oc/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/oc/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/oc/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/sv/accessx-status.xml
 share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png
@@ -253,6 +270,12 @@ ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-preferences.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/context-menu.png
+${BATTSTAT}share/gnome/help/battstat/oc/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png
+${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-credits-hal.png
+${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-preferences.png
+${BATTSTAT}share/gnome/help/battstat/oc/figures/context-menu.png
 ${BATTSTAT}share/gnome/help/battstat/pa/battstat.xml
 ${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
 ${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet.png
@@ -307,11 +330,21 @@ share/gnome/help/char-palette/nl/figures/charpalette_applet.png
 share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/nl/figures/charpick-preferences.png
 share/gnome/help/char-palette/nl/figures/charpick_characters.png
+share/gnome/help/char-palette/oc/char-palette.xml
+share/gnome/help/char-palette/oc/figures/charpalette_applet.png
+share/gnome/help/char-palette/oc/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/oc/figures/charpick-preferences.png
+share/gnome/help/char-palette/oc/figures/charpick_characters.png
 share/gnome/help/char-palette/pt_BR/char-palette.xml
 share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
 share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
 share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
+share/gnome/help/char-palette/ru/char-palette.xml
+share/gnome/help/char-palette/ru/figures/charpalette_applet.png
+share/gnome/help/char-palette/ru/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/ru/figures/charpick-preferences.png
+share/gnome/help/char-palette/ru/figures/charpick_characters.png
 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
@@ -322,87 +355,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png
 share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/uk/figures/charpick-preferences.png
 share/gnome/help/char-palette/uk/figures/charpick_characters.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/legal.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/cpufreq-applet.xml
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-100.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-25.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-50.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-75.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences-smp.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png
 share/gnome/help/drivemount/C/drivemount.xml
 share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
@@ -434,6 +386,12 @@ share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/it/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/oc/drivemount.xml
+share/gnome/help/drivemount/oc/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/oc/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/pa/drivemount.xml
 share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
@@ -469,6 +427,8 @@ share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/bg/figures/geyes_applet.png
 share/gnome/help/geyes/bg/geyes.xml
+share/gnome/help/geyes/ca/figures/geyes_applet.png
+share/gnome/help/geyes/ca/geyes.xml
 share/gnome/help/geyes/en_GB/figures/geyes_applet.png
 share/gnome/help/geyes/en_GB/geyes.xml
 share/gnome/help/geyes/es/figures/geyes_applet.png
@@ -477,6 +437,8 @@ share/gnome/help/geyes/fr/figures/geyes_applet.png
 share/gnome/help/geyes/fr/geyes.xml
 share/gnome/help/geyes/it/figures/geyes_applet.png
 share/gnome/help/geyes/it/geyes.xml
+share/gnome/help/geyes/oc/figures/geyes_applet.png
+share/gnome/help/geyes/oc/geyes.xml
 share/gnome/help/geyes/ru/figures/geyes_applet.png
 share/gnome/help/geyes/ru/geyes.xml
 share/gnome/help/geyes/sv/figures/geyes_applet.png
@@ -559,6 +521,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
 share/gnome/help/gweather/nl/figures/stock_weather-storm.png
 share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
 share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/oc/figures/gweather-details.png
+share/gnome/help/gweather/oc/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-general.png
+share/gnome/help/gweather/oc/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/oc/figures/gweather_applet.png
+share/gnome/help/gweather/oc/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/oc/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-fog.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/oc/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/oc/figures/stock_weather-showers.png
+share/gnome/help/gweather/oc/figures/stock_weather-snow.png
+share/gnome/help/gweather/oc/figures/stock_weather-storm.png
+share/gnome/help/gweather/oc/figures/stock_weather-sunny.png
+share/gnome/help/gweather/oc/gweather.xml
 share/gnome/help/gweather/pa/figures/gweather-details.png
 share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
@@ -607,6 +584,8 @@ share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ca/mixer_applet2.xml
 share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
@@ -615,6 +594,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
 share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/oc/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/oc/mixer_applet2.xml
 share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
 share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
@@ -628,6 +609,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/ca/figures/multiload-preferences.png
+share/gnome/help/multiload/ca/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ca/figures/system_monitor.png
+share/gnome/help/multiload/ca/multiload.xml
 share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
 share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/en_GB/figures/system_monitor.png
@@ -640,6 +625,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
 share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/fr/figures/system_monitor.png
 share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/oc/figures/multiload-preferences.png
+share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/oc/figures/system_monitor.png
+share/gnome/help/multiload/oc/multiload.xml
 share/gnome/help/multiload/pa/figures/multiload-preferences.png
 share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/pa/figures/system_monitor.png
@@ -681,6 +670,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/oc/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/oc/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
@@ -712,6 +707,8 @@ share/gnome/help/trashapplet/it/figures/trash-applet.png
 share/gnome/help/trashapplet/it/trashapplet.xml
 share/gnome/help/trashapplet/nl/figures/trash-applet.png
 share/gnome/help/trashapplet/nl/trashapplet.xml
+share/gnome/help/trashapplet/oc/figures/trash-applet.png
+share/gnome/help/trashapplet/oc/trashapplet.xml
 share/gnome/help/trashapplet/pa/figures/trash-applet.png
 share/gnome/help/trashapplet/pa/trashapplet.xml
 share/gnome/help/trashapplet/ru/figures/trash-applet.png
@@ -720,27 +717,24 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png
 share/gnome/help/trashapplet/sv/trashapplet.xml
 share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/trashapplet.xml
-${CPUFREQ}share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
 share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
 share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
-${CPUFREQ}share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png
 share/icons/hicolor/22x22/apps/gnome-eyes-applet.png
 share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png
-${CPUFREQ}share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png
 share/icons/hicolor/24x24/apps/gnome-eyes-applet.png
 share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png
-${CPUFREQ}share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png
 share/icons/hicolor/32x32/apps/gnome-eyes-applet.png
 share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png
 share/icons/hicolor/48x48/apps/ax-applet.png
 share/icons/hicolor/48x48/apps/charpick.png
-${CPUFREQ}share/icons/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg
 share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg
 share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
 share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
@@ -805,6 +799,7 @@ share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
@@ -813,6 +808,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo
@@ -832,11 +828,13 @@ share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 share/omf/accessx-status/accessx-status-C.omf
 share/omf/accessx-status/accessx-status-bg.omf
+share/omf/accessx-status/accessx-status-ca.omf
 share/omf/accessx-status/accessx-status-en_GB.omf
 share/omf/accessx-status/accessx-status-es.omf
 share/omf/accessx-status/accessx-status-fr.omf
 share/omf/accessx-status/accessx-status-it.omf
 share/omf/accessx-status/accessx-status-nl.omf
+share/omf/accessx-status/accessx-status-oc.omf
 share/omf/accessx-status/accessx-status-sv.omf
 share/omf/accessx-status/accessx-status-uk.omf
 ${BATTSTAT}share/omf/battstat/battstat-C.omf
@@ -844,6 +842,7 @@ ${BATTSTAT}share/omf/battstat/battstat-bg.omf
 ${BATTSTAT}share/omf/battstat/battstat-en_GB.omf
 ${BATTSTAT}share/omf/battstat/battstat-es.omf
 ${BATTSTAT}share/omf/battstat/battstat-fr.omf
+${BATTSTAT}share/omf/battstat/battstat-oc.omf
 ${BATTSTAT}share/omf/battstat/battstat-pa.omf
 ${BATTSTAT}share/omf/battstat/battstat-sv.omf
 ${BATTSTAT}share/omf/battstat/battstat-uk.omf
@@ -854,22 +853,17 @@ share/omf/char-palette/char-palette-es.omf
 share/omf/char-palette/char-palette-fr.omf
 share/omf/char-palette/char-palette-it.omf
 share/omf/char-palette/char-palette-nl.omf
+share/omf/char-palette/char-palette-oc.omf
 share/omf/char-palette/char-palette-pt_BR.omf
+share/omf/char-palette/char-palette-ru.omf
 share/omf/char-palette/char-palette-sv.omf
 share/omf/char-palette/char-palette-uk.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-C.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-es.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-fr.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-nl.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-sv.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-uk.omf
-${CPUFREQ}share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
 share/omf/drivemount/drivemount-C.omf
 share/omf/drivemount/drivemount-en_GB.omf
 share/omf/drivemount/drivemount-es.omf
 share/omf/drivemount/drivemount-fr.omf
 share/omf/drivemount/drivemount-it.omf
+share/omf/drivemount/drivemount-oc.omf
 share/omf/drivemount/drivemount-pa.omf
 share/omf/drivemount/drivemount-ru.omf
 share/omf/drivemount/drivemount-sv.omf
@@ -877,10 +871,12 @@ share/omf/drivemount/drivemount-uk.omf
 share/omf/drivemount/drivemount-zh_CN.omf
 share/omf/geyes/geyes-C.omf
 share/omf/geyes/geyes-bg.omf
+share/omf/geyes/geyes-ca.omf
 share/omf/geyes/geyes-en_GB.omf
 share/omf/geyes/geyes-es.omf
 share/omf/geyes/geyes-fr.omf
 share/omf/geyes/geyes-it.omf
+share/omf/geyes/geyes-oc.omf
 share/omf/geyes/geyes-ru.omf
 share/omf/geyes/geyes-sv.omf
 share/omf/geyes/geyes-uk.omf
@@ -889,22 +885,27 @@ share/omf/gweather/gweather-en_GB.omf
 share/omf/gweather/gweather-es.omf
 share/omf/gweather/gweather-fr.omf
 share/omf/gweather/gweather-nl.omf
+share/omf/gweather/gweather-oc.omf
 share/omf/gweather/gweather-pa.omf
 share/omf/gweather/gweather-sv.omf
 share/omf/gweather/gweather-uk.omf
 share/omf/mixer_applet2/mixer_applet2-C.omf
+share/omf/mixer_applet2/mixer_applet2-ca.omf
 share/omf/mixer_applet2/mixer_applet2-en_GB.omf
 share/omf/mixer_applet2/mixer_applet2-es.omf
 share/omf/mixer_applet2/mixer_applet2-fr.omf
 share/omf/mixer_applet2/mixer_applet2-it.omf
+share/omf/mixer_applet2/mixer_applet2-oc.omf
 share/omf/mixer_applet2/mixer_applet2-pa.omf
 share/omf/mixer_applet2/mixer_applet2-ru.omf
 share/omf/mixer_applet2/mixer_applet2-sv.omf
 share/omf/mixer_applet2/mixer_applet2-uk.omf
 share/omf/multiload/multiload-C.omf
+share/omf/multiload/multiload-ca.omf
 share/omf/multiload/multiload-en_GB.omf
 share/omf/multiload/multiload-es.omf
 share/omf/multiload/multiload-fr.omf
+share/omf/multiload/multiload-oc.omf
 share/omf/multiload/multiload-pa.omf
 share/omf/multiload/multiload-ru.omf
 share/omf/multiload/multiload-sv.omf
@@ -913,6 +914,7 @@ share/omf/stickynotes_applet/stickynotes_applet-C.omf
 share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
 share/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/omf/stickynotes_applet/stickynotes_applet-oc.omf
 share/omf/stickynotes_applet/stickynotes_applet-pa.omf
 share/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/omf/stickynotes_applet/stickynotes_applet-uk.omf
@@ -922,6 +924,7 @@ share/omf/trashapplet/trashapplet-es.omf
 share/omf/trashapplet/trashapplet-fr.omf
 share/omf/trashapplet/trashapplet-it.omf
 share/omf/trashapplet/trashapplet-nl.omf
+share/omf/trashapplet/trashapplet-oc.omf
 share/omf/trashapplet/trashapplet-pa.omf
 share/omf/trashapplet/trashapplet-ru.omf
 share/omf/trashapplet/trashapplet-sv.omf
@@ -962,11 +965,6 @@ 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
-${CPUFREQ}share/pixmaps/cpufreq-applet/cpufreq-100.png
-${CPUFREQ}share/pixmaps/cpufreq-applet/cpufreq-25.png
-${CPUFREQ}share/pixmaps/cpufreq-applet/cpufreq-50.png
-${CPUFREQ}share/pixmaps/cpufreq-applet/cpufreq-75.png
-${CPUFREQ}share/pixmaps/cpufreq-applet/cpufreq-na.png
 share/pixmaps/invest-big.png
 share/pixmaps/stickynotes/close.png
 share/pixmaps/stickynotes/locked.png
@@ -1061,7 +1059,6 @@ share/xmodmap/xmodmap.us_intl
 share/xmodmap/xmodmap.yu
 @dirrm share/xmodmap
 @dirrm share/pixmaps/stickynotes
-${CPUFREQ}@dirrm share/pixmaps/cpufreq-applet
 @dirrm share/pixmaps/accessx-status-applet
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/trashapplet
@@ -1072,7 +1069,6 @@ ${CPUFREQ}@dirrm share/pixmaps/cpufreq-applet
 @dirrm share/omf/geyes
 @dirrm share/omf/drivemount
 @dirrm share/omf/char-palette
-${CPUFREQ}@dirrm share/omf/cpufreq-applet
 ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/omf/accessx-status
 @comment in scrollkeeper: @dirrm share/omf
@@ -1091,6 +1087,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/trashapplet/ru
 @dirrm share/gnome/help/trashapplet/pa/figures
 @dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/oc/figures
+@dirrm share/gnome/help/trashapplet/oc
 @dirrm share/gnome/help/trashapplet/nl/figures
 @dirrm share/gnome/help/trashapplet/nl
 @dirrm share/gnome/help/trashapplet/it/figures
@@ -1110,6 +1108,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/stickynotes_applet/sv
 @dirrm share/gnome/help/stickynotes_applet/pa/figures
 @dirrm share/gnome/help/stickynotes_applet/pa
+@dirrm share/gnome/help/stickynotes_applet/oc/figures
+@dirrm share/gnome/help/stickynotes_applet/oc
 @dirrm share/gnome/help/stickynotes_applet/fr/figures
 @dirrm share/gnome/help/stickynotes_applet/fr
 @dirrm share/gnome/help/stickynotes_applet/es/figures
@@ -1127,12 +1127,16 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/multiload/ru
 @dirrm share/gnome/help/multiload/pa/figures
 @dirrm share/gnome/help/multiload/pa
+@dirrm share/gnome/help/multiload/oc/figures
+@dirrm share/gnome/help/multiload/oc
 @dirrm share/gnome/help/multiload/fr/figures
 @dirrm share/gnome/help/multiload/fr
 @dirrm share/gnome/help/multiload/es/figures
 @dirrm share/gnome/help/multiload/es
 @dirrm share/gnome/help/multiload/en_GB/figures
 @dirrm share/gnome/help/multiload/en_GB
+@dirrm share/gnome/help/multiload/ca/figures
+@dirrm share/gnome/help/multiload/ca
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
@@ -1144,6 +1148,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/mixer_applet2/ru
 @dirrm share/gnome/help/mixer_applet2/pa/figures
 @dirrm share/gnome/help/mixer_applet2/pa
+@dirrm share/gnome/help/mixer_applet2/oc/figures
+@dirrm share/gnome/help/mixer_applet2/oc
 @dirrm share/gnome/help/mixer_applet2/it/figures
 @dirrm share/gnome/help/mixer_applet2/it
 @dirrm share/gnome/help/mixer_applet2/fr/figures
@@ -1152,6 +1158,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/mixer_applet2/es
 @dirrm share/gnome/help/mixer_applet2/en_GB/figures
 @dirrm share/gnome/help/mixer_applet2/en_GB
+@dirrm share/gnome/help/mixer_applet2/ca/figures
+@dirrm share/gnome/help/mixer_applet2/ca
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
@@ -1161,6 +1169,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/gweather/sv
 @dirrm share/gnome/help/gweather/pa/figures
 @dirrm share/gnome/help/gweather/pa
+@dirrm share/gnome/help/gweather/oc/figures
+@dirrm share/gnome/help/gweather/oc
 @dirrm share/gnome/help/gweather/nl/figures
 @dirrm share/gnome/help/gweather/nl
 @dirrm share/gnome/help/gweather/fr/figures
@@ -1178,6 +1188,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/geyes/sv
 @dirrm share/gnome/help/geyes/ru/figures
 @dirrm share/gnome/help/geyes/ru
+@dirrm share/gnome/help/geyes/oc/figures
+@dirrm share/gnome/help/geyes/oc
 @dirrm share/gnome/help/geyes/it/figures
 @dirrm share/gnome/help/geyes/it
 @dirrm share/gnome/help/geyes/fr/figures
@@ -1186,6 +1198,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/en_GB/figures
 @dirrm share/gnome/help/geyes/en_GB
+@dirrm share/gnome/help/geyes/ca/figures
+@dirrm share/gnome/help/geyes/ca
 @dirrm share/gnome/help/geyes/bg/figures
 @dirrm share/gnome/help/geyes/bg
 @dirrm share/gnome/help/geyes/C/figures
@@ -1201,6 +1215,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/drivemount/ru
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
+@dirrm share/gnome/help/drivemount/oc/figures
+@dirrm share/gnome/help/drivemount/oc
 @dirrm share/gnome/help/drivemount/it/figures
 @dirrm share/gnome/help/drivemount/it
 @dirrm share/gnome/help/drivemount/fr/figures
@@ -1212,29 +1228,16 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/zh_CN
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/uk
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/sv
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/nl
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/fr
-${CPUFREQ}share/gnome/help/cpufreq-applet/es/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/es
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/en_GB
-${CPUFREQ}share/gnome/help/cpufreq-applet/C/figures
-${CPUFREQ}share/gnome/help/cpufreq-applet/C
-${CPUFREQ}share/gnome/help/cpufreq-applet
 @dirrm share/gnome/help/char-palette/uk/figures
 @dirrm share/gnome/help/char-palette/uk
 @dirrm share/gnome/help/char-palette/sv/figures
 @dirrm share/gnome/help/char-palette/sv
+@dirrm share/gnome/help/char-palette/ru/figures
+@dirrm share/gnome/help/char-palette/ru
 @dirrm share/gnome/help/char-palette/pt_BR/figures
 @dirrm share/gnome/help/char-palette/pt_BR
+@dirrm share/gnome/help/char-palette/oc/figures
+@dirrm share/gnome/help/char-palette/oc
 @dirrm share/gnome/help/char-palette/nl/figures
 @dirrm share/gnome/help/char-palette/nl
 @dirrm share/gnome/help/char-palette/it/figures
@@ -1256,6 +1259,8 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat/sv/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/sv
 ${BATTSTAT}@dirrm share/gnome/help/battstat/pa/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/pa
+${BATTSTAT}@dirrm share/gnome/help/battstat/oc/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/oc
 ${BATTSTAT}@dirrm share/gnome/help/battstat/fr/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/fr
 ${BATTSTAT}@dirrm share/gnome/help/battstat/es/figures
@@ -1271,6 +1276,8 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 @dirrm share/gnome/help/accessx-status/uk
 @dirrm share/gnome/help/accessx-status/sv/figures
 @dirrm share/gnome/help/accessx-status/sv
+@dirrm share/gnome/help/accessx-status/oc/figures
+@dirrm share/gnome/help/accessx-status/oc
 @dirrm share/gnome/help/accessx-status/nl/figures
 @dirrm share/gnome/help/accessx-status/nl
 @dirrm share/gnome/help/accessx-status/it/figures
@@ -1281,6 +1288,8 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 @dirrm share/gnome/help/accessx-status/es
 @dirrm share/gnome/help/accessx-status/en_GB/figures
 @dirrm share/gnome/help/accessx-status/en_GB
+@dirrm share/gnome/help/accessx-status/ca/figures
+@dirrm share/gnome/help/accessx-status/ca
 @dirrm share/gnome/help/accessx-status/bg/figures
 @dirrm share/gnome/help/accessx-status/bg
 @dirrm share/gnome/help/accessx-status/C/figures
@@ -1303,7 +1312,6 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 ${BATTSTAT}@dirrm share/examples/gnome-applets/sound/events
 ${BATTSTAT}@dirrm share/examples/gnome-applets/sound
 ${BATTSTAT}@dirrm share/examples/gnome-applets
-@comment in xdg-dirs: @dirrm share/applications
 @dirrm ${PYSITELIB}/invest
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/libgweather
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 9356dc6d847..38687158edc 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.10 2007/09/20 00:00:02 wiz Exp $
+$NetBSD: distinfo,v 1.11 2007/11/05 19:23:31 drochner Exp $
 
-SHA1 (gnome-applets-2.18.0.tar.bz2) = 7bec1f642e827634f74859e81e1502799d3c05a2
-RMD160 (gnome-applets-2.18.0.tar.bz2) = c9a18c717fd01ede9476a70784a8522968e52211
-Size (gnome-applets-2.18.0.tar.bz2) = 7133902 bytes
+SHA1 (gnome-applets-2.20.0.tar.bz2) = 0733249eeb2930fb55c251e1c1f9846e01d1a8b9
+RMD160 (gnome-applets-2.20.0.tar.bz2) = 47cf69002d88d6905ade68a18e457d8fbc6c70b3
+Size (gnome-applets-2.20.0.tar.bz2) = 7488862 bytes
 SHA1 (patch-aa) = d4683f2d1273c4202ee336be436b9fd237610b7b
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
 SHA1 (patch-ac) = 8244d73dd62973fdc022947a62e9ce6211a3561b
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
-SHA1 (patch-ae) = 16f66d3012a7ef7cfb5b72fdaa0f3e7719eea8f4
-SHA1 (patch-af) = e938bbc263cb9d70f613893ab414b13e8a1eaafd
-SHA1 (patch-ag) = 6e30ee254c7a53b05560831073549269830ad872
diff --git a/x11/gnome-applets/patches/patch-ae b/x11/gnome-applets/patches/patch-ae
deleted file mode 100644
index 83300741bb8..00000000000
--- a/x11/gnome-applets/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/09/20 00:00:03 wiz Exp $
-
---- geyes/Makefile.in.orig	2007-03-12 14:04:23.000000000 +0100
-+++ geyes/Makefile.in
-@@ -867,7 +867,7 @@ install-data-local:
- 	for icon in $(icons); do \
- 		SIZE=`echo $$icon | cut -d. -f2`; \
- 		FILE=`echo $$icon | cut -d. -f1,3`; \
--		if [ "$$SIZE" == "svg" ]; then \
-+		if [ "$$SIZE" = "svg" ]; then \
- 			SIZE="scalable"; \
- 			FILE="$$FILE.svg"; \
- 		else \
diff --git a/x11/gnome-applets/patches/patch-af b/x11/gnome-applets/patches/patch-af
deleted file mode 100644
index aa92ed7ba33..00000000000
--- a/x11/gnome-applets/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2007/09/20 00:00:03 wiz Exp $
-
---- ./stickynotes/pixmaps/Makefile.in.orig	2007-04-17 18:13:05.000000000 +0200
-+++ ./stickynotes/pixmaps/Makefile.in
-@@ -563,7 +563,7 @@ install-data-local:
- 	for icon in $(icons); do \
- 		SIZE=`echo $$icon | cut -d. -f2`; \
- 		FILE=`echo $$icon | cut -d. -f1,3`; \
--		if [ "$$SIZE" == "svg" ]; then \
-+		if [ "$$SIZE" = "svg" ]; then \
- 			SIZE="scalable"; \
- 			FILE="$$FILE.svg"; \
- 		else \
diff --git a/x11/gnome-applets/patches/patch-ag b/x11/gnome-applets/patches/patch-ag
deleted file mode 100644
index 64aca64ce67..00000000000
--- a/x11/gnome-applets/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2007/09/20 00:00:03 wiz Exp $
-
---- mixer/Makefile.in.orig	2007-09-17 17:52:12.000000000 +0200
-+++ mixer/Makefile.in
-@@ -383,7 +383,6 @@ target_alias = @target_alias@
- SUBDIRS = docs
- INCLUDES = -I. -I$(srcdir) 		\
- 	-DG_DISABLE_DEPRECATED		\
--	-DGTK_DISABLE_DEPRECATED	\
- 	-DGDK_DISABLE_DEPRECATED	\
- 	$(MIXER_CFLAGS)			\
- 	$(GNOME_APPLETS_CFLAGS)		\