update to 2.26.2

changes:
-fixes to the weather and mixer applets
-translation updates

4 files changed, 55 insertions, 12 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index c51ad2a1618..28b8b841c77 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2009/04/17 18:11:04 drochner Exp $
+# $NetBSD: Makefile,v 1.73 2009/06/08 11:05:28 drochner Exp $
 #
 
-DISTNAME=		gnome-applets-2.26.1
+DISTNAME=		gnome-applets-2.26.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.26/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST
index 849522e6c4a..f27d495e453 100644
--- a/x11/gnome-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/04/17 18:11:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2009/06/08 11:05:28 drochner Exp $
 bin/invest-chart
 lib/bonobo/servers/GNOME_AccessxStatusApplet.server
 ${PLIST.battstat}lib/bonobo/servers/GNOME_BattstatApplet.server
@@ -311,6 +311,18 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/zh_CN/accessx-status.xml
+share/gnome/help/accessx-status/zh_CN/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png
 ${PLIST.battstat}share/gnome/help/battstat/C/battstat.xml
 ${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet-expanded.png
 ${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet.png
@@ -493,6 +505,11 @@ 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
+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-preferences.png
+share/gnome/help/char-palette/zh_CN/figures/charpick_characters.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
@@ -627,6 +644,8 @@ share/gnome/help/geyes/sv/figures/geyes_applet.png
 share/gnome/help/geyes/sv/geyes.xml
 share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/geyes.xml
+share/gnome/help/geyes/zh_CN/figures/geyes_applet.png
+share/gnome/help/geyes/zh_CN/geyes.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
 share/gnome/help/gswitchit/ca/gswitchit.xml
@@ -908,6 +927,7 @@ share/gnome/help/invest-applet/es/invest-applet.xml
 share/gnome/help/invest-applet/fi/invest-applet.xml
 share/gnome/help/invest-applet/ru/invest-applet.xml
 share/gnome/help/invest-applet/sv/invest-applet.xml
+share/gnome/help/invest-applet/zh_CN/invest-applet.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
@@ -947,6 +967,8 @@ share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
 share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
+share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml
 share/gnome/help/multiload/C/figures/multiload-preferences.png
 share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
@@ -1012,6 +1034,10 @@ share/gnome/help/multiload/uk/figures/multiload-preferences.png
 share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/uk/figures/system_monitor.png
 share/gnome/help/multiload/uk/multiload.xml
+share/gnome/help/multiload/zh_CN/figures/multiload-preferences.png
+share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/zh_CN/figures/system_monitor.png
+share/gnome/help/multiload/zh_CN/multiload.xml
 share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png
@@ -1287,6 +1313,7 @@ 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
+share/omf/accessx-status/accessx-status-zh_CN.omf
 ${PLIST.battstat}share/omf/battstat/battstat-C.omf
 ${PLIST.battstat}share/omf/battstat/battstat-bg.omf
 ${PLIST.battstat}share/omf/battstat/battstat-de.omf
@@ -1320,6 +1347,7 @@ 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
+share/omf/char-palette/char-palette-zh_CN.omf
 share/omf/drivemount/drivemount-C.omf
 share/omf/drivemount/drivemount-de.omf
 share/omf/drivemount/drivemount-el.omf
@@ -1354,6 +1382,7 @@ share/omf/geyes/geyes-oc.omf
 share/omf/geyes/geyes-ru.omf
 share/omf/geyes/geyes-sv.omf
 share/omf/geyes/geyes-uk.omf
+share/omf/geyes/geyes-zh_CN.omf
 share/omf/gswitchit/gswitchit-C.omf
 share/omf/gswitchit/gswitchit-ca.omf
 share/omf/gswitchit/gswitchit-cs.omf
@@ -1394,6 +1423,7 @@ share/omf/invest-applet/invest-applet-es.omf
 share/omf/invest-applet/invest-applet-fi.omf
 share/omf/invest-applet/invest-applet-ru.omf
 share/omf/invest-applet/invest-applet-sv.omf
+share/omf/invest-applet/invest-applet-zh_CN.omf
 share/omf/mixer_applet2/mixer_applet2-C.omf
 share/omf/mixer_applet2/mixer_applet2-ca.omf
 share/omf/mixer_applet2/mixer_applet2-cs.omf
@@ -1413,6 +1443,7 @@ share/omf/mixer_applet2/mixer_applet2-pt_BR.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/mixer_applet2/mixer_applet2-zh_CN.omf
 share/omf/multiload/multiload-C.omf
 share/omf/multiload/multiload-ca.omf
 share/omf/multiload/multiload-de.omf
@@ -1429,6 +1460,7 @@ share/omf/multiload/multiload-pt_BR.omf
 share/omf/multiload/multiload-ru.omf
 share/omf/multiload/multiload-sv.omf
 share/omf/multiload/multiload-uk.omf
+share/omf/multiload/multiload-zh_CN.omf
 share/omf/stickynotes_applet/stickynotes_applet-C.omf
 share/omf/stickynotes_applet/stickynotes_applet-ca.omf
 share/omf/stickynotes_applet/stickynotes_applet-de.omf
@@ -1693,6 +1725,8 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/zh_CN/figures
+@dirrm share/gnome/help/multiload/zh_CN
 @dirrm share/gnome/help/multiload/uk/figures
 @dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/sv/figures
@@ -1726,6 +1760,8 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
+@dirrm share/gnome/help/mixer_applet2/zh_CN/figures
+@dirrm share/gnome/help/mixer_applet2/zh_CN
 @dirrm share/gnome/help/mixer_applet2/uk/figures
 @dirrm share/gnome/help/mixer_applet2/uk
 @dirrm share/gnome/help/mixer_applet2/sv/figures
@@ -1765,6 +1801,7 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @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/invest-applet/zh_CN
 @dirrm share/gnome/help/invest-applet/sv
 @dirrm share/gnome/help/invest-applet/ru
 @dirrm share/gnome/help/invest-applet/fi
@@ -1825,6 +1862,8 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/gswitchit/ca
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
+@dirrm share/gnome/help/geyes/zh_CN/figures
+@dirrm share/gnome/help/geyes/zh_CN
 @dirrm share/gnome/help/geyes/uk/figures
 @dirrm share/gnome/help/geyes/uk
 @dirrm share/gnome/help/geyes/sv/figures
@@ -1895,6 +1934,8 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
+@dirrm share/gnome/help/char-palette/zh_CN/figures
+@dirrm share/gnome/help/char-palette/zh_CN
 @dirrm share/gnome/help/char-palette/uk/figures
 @dirrm share/gnome/help/char-palette/uk
 @dirrm share/gnome/help/char-palette/sv/figures
@@ -1963,6 +2004,8 @@ ${PLIST.battstat}@dirrm share/gnome/help/battstat/bg
 ${PLIST.battstat}@dirrm share/gnome/help/battstat/C/figures
 ${PLIST.battstat}@dirrm share/gnome/help/battstat/C
 ${PLIST.battstat}@dirrm share/gnome/help/battstat
+@dirrm share/gnome/help/accessx-status/zh_CN/figures
+@dirrm share/gnome/help/accessx-status/zh_CN
 @dirrm share/gnome/help/accessx-status/uk/figures
 @dirrm share/gnome/help/accessx-status/uk
 @dirrm share/gnome/help/accessx-status/sv/figures
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 28ed6aed872..fd6c8606614 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2009/04/17 18:11:04 drochner Exp $
+$NetBSD: distinfo,v 1.23 2009/06/08 11:05:28 drochner Exp $
 
-SHA1 (gnome-applets-2.26.1.tar.bz2) = 42b678064e4d0923c2130ac02f488871b9db7c88
-RMD160 (gnome-applets-2.26.1.tar.bz2) = f76aa8a6b03e1375bad3bce5e2ee1b477a2e9097
-Size (gnome-applets-2.26.1.tar.bz2) = 8786596 bytes
-SHA1 (patch-aa) = 331bd330c6a19ba1647f302419374e140c269d95
+SHA1 (gnome-applets-2.26.2.tar.bz2) = 5126d80c8661ab6b85850e919d2d295693e0ee7e
+RMD160 (gnome-applets-2.26.2.tar.bz2) = 3605219a5b3f2c9f23c34b72a226f9950d7d1341
+Size (gnome-applets-2.26.2.tar.bz2) = 9056741 bytes
+SHA1 (patch-aa) = 764fc46c7c000e21a1602286443e2633ec743631
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
diff --git a/x11/gnome-applets/patches/patch-aa b/x11/gnome-applets/patches/patch-aa
index a05946cd4f3..a8611396b4e 100644
--- a/x11/gnome-applets/patches/patch-aa
+++ b/x11/gnome-applets/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2008/10/27 04:23:01 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2009/06/08 11:05:28 drochner Exp $
 
---- battstat/sounds/Makefile.in.orig	2008-09-25 23:51:38.000000000 +0000
+--- battstat/sounds/Makefile.in.orig	2009-05-31 00:27:26.000000000 +0200
 +++ battstat/sounds/Makefile.in
-@@ -306,7 +306,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -288,7 +288,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -soundlistdir = $(sysconfdir)/sound/events