Update gnome-panel to 2.26.0.

==============
Version 2.26.0
==============

  Panel

	* Ignore shadow mounts in the panel menus (Vincent)
	* Mark desktop files as trusted when it makes sense (Vincent)

  Clock Applet

	* Fix bad memory usage for a string returned by libical (Vincent)

  Misc

	* Remove scrollkeeper check, since it belongs to gnome-doc-utils
	  (Vincent)

  Docs Translators

	* Jen Ockwell (en_GB)
	* Jan Brož and Lucas Lommer (cs)

  Translators

	* Runa Bhattacharjee (bn_IN)
	* Reşat SABIQ (crh)
	* Hendrik Richter (de)
	* Fotis Tsamis (el)
	* Jorge González (es)
	* Mattias Põldaru (et)
	* Claude Paroz (fr)
	* Suso Baleato (gl)
	* Ankit Patel (gu)
	* Yaron Shahrabani (he)
	* Rajesh Ranjan (hi)
	* Luca Ferretti (it)
	* Žygimantas Beručka (lt)
	* wadim dziedzic (pl)
	* Duarte Loreto (pt)
	* Adi Roiban (ro)
	* Yuriy Penkin (ru)
	* I. Felix (ta)
	* Theppitak Karoonboonyanan (th)

===============
Version 2.25.92
===============

  Panel

	* Fix some randr-interaction by connecting to the monitors-changed
	  signal. This shouldn't be needed with the latest GTK+, but we keep to
	  be 100% sure it will work in 2.26.0. (Matthias Clasen)
	* Use close button instead of ok button in error dialogs (Vincent)

  All Applets

	* Use close button instead of ok button in error dialogs (Vincent)

  Translators

	* Reşat SABIQ (crh)
	* Philip Withnall (en_GB)
	* Jorge González (es)
	* Ivar Smolin (et)
	* Luca Ferretti (it)
	* Raivis Dejus (lv)
	* Thierry Randrianiriana (mg)
	* Praveen Arimbrathodiyil (ml)
	* Adi Roiban (ro)
	* Pavol Šimo (sk)
	* Dr.T.vasudevan (ta)

===============
Version 2.25.91
===============

  Panel

	* Remove the mixer applet from the default configuration since GNOME
	  upstream doesn't ship this applet by default. Some distributions
	  might want to put it back. The patch to be reverted is:
	  http://svn.gnome.org/viewvc/gnome-panel/trunk/gnome-panel/panel-default-setup.entries?r1=11171&r2=11512&view=patch
	  (Vincent)

  Clock Applet

	* Fix properties dialog to not have a missing image and a weird title
	  (Matthias Clasen)
	* Use new GTK+ feature to change orientation of GtkBox instead of
	  custom code (Christian Persch)

  Notification Area Applet

	* Use new GTK+ feature to change orientation of GtkBox instead of
	  custom code (Christian Persch)

  Misc

	* Require GTK+ 2.15.1 (Christian Persch)

  Docs Translators

	* Iñaki Larrañaga Murgoitio (eu)

  Translators

	* Astur (ast)
	* Ihar Hrachyshka (be@latin)
	* Alexander Shopov (bg)
	* Ask Hjorth Larsen (da)
	* Dawa pemo (dz)
	* Jorge González (es)
	* Iñaki Larrañaga Murgoitio (eu)
	* Ignacio Casal Quinteiro (gl)
	* Luca Ferretti (it)
	* Takeshi AIHANA (ja)
	* Vladimer Sichinava ვლადიმერ სიჭინავა (ka)
	* Shankar Prasad (kn)
	* Rafael Garcia (la)
	* Jovan Naumovski (mk)
	* Wouter Bolsterlee (nl)
	* Manoj Kumar Giri (or)
	* Tomasz Dominikowski (pl)
	* Duarte Loreto (pt)
	* Adi Roiban (ro)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)
	* 甘露(Gan Lu) (zh_CN)
	* Chao-Hsiung Liao (zh_HK)
	* Chao-Hsiung Liao (zh_TW)

===============
Version 2.25.90
===============

  Panel

	* Add a timeout of 5 seconds to do the panel initial animation, in case
	  an applet is blocked while it's loading (Vincent)
	* Fix some format security warnings (Frédéric Crozat)

  Clock Applet

	* Fix some format security warnings (Frédéric Crozat)
	* Fix the dbus configuration file to specify the destination that is
	  allowed instead of just some non-existing interfaces (Vincent)
	* Properly initialize the eds part handling passwords, fixing some
	  hangs (Simon Brys, Vincent)

  Fish Applet

	* Fix some format security warnings (Frédéric Crozat)
	* Build fixes (Vincent)

  Notification Area Applet

	* Fix some format security warnings (Frédéric Crozat)

  Translators

	* Jordi Mallach (ca)
	* Ilkka Tuohela (fi)
	* Vladimer Sichinava ვლადიმერ სიჭინავა (ka)
	* Changwoo Ryu (ko)
	* Raivis Dejus (lv)
	* Jovan Naumovski (mk)
	* Sandeep Shedmake (mr)
	* Kjartan Maraas (nb)
	* André Gondim (pt_BR)
	* Krishna Babu K (te)

================
Version 2.25.5.1
================

  Panel

	* Fix a crash when the user configuration contains a separator
	  (Vincent)

==============
Version 2.25.5
==============

  Panel

	* Only show shutdown/reboot menu items if made available by the session
	  manager (Ray Strode)
	* Only allow dragging panels when pressing a modifier button (usually
	  Alt) for expanded panels (Vincent, William Lachance)
	* Delay the initial panel animation until applets/objects are loaded
	  (Ray Strode, Vincent)
	* Fix initial animation not happening for newly created panels
	  (Vincent)
	* Fix unloaded panels with existing configuration appearing empty when
	  reloaded in gconf (Vincent)
	* Correctly set the struts of the panel at the very early start so that
	  desktop icons don't jump around on login (Vincent, Ray Strode)
	* Connect to the session manager when we're really ready, instead of
	  doing it too early. This helps with desktop icons too (Behdad
	  Esfahbod, Vincent)
	* Respect TryExec key in desktop files that we directly put in the
	  menus (Matthias Clasen, Vincent)

  Clock Applet

	* Hide the option to use 12/24 hours if it's not supported in the
	  current locale (Vincent)
	* Fix a crash on Solaris when the weather code is empty (Vincent)
	* Minor HIG fix

  Misc

	* Fix applet compilation by explicitly listing LIBPANEL_APPLET_LIBS in
	  LDADD (Vincent)

  Translators

	* Petr Kovar (cs)
	* Andre Klapper (de)
	* Jorge González (es)
	* saudat mohammed (ha)
	* Gabor Kelemen (hu)
	* Onye, Sylvester (ig)
	* Kjartan Maraas (nb)
	* Daniel Nylander (sv)
	* Fajuyitan, Sunday Ayo (yo)

==============
Version 2.25.3
==============

Note to distributors: this release might break various other applications
(mostly applets, though). If this is the case, please contact the gnome-panel
developers to see if changes should be reverted.

 + we do not have a bonobo PanelShell interface. As far as I know, it wasn't
   used by anything and was useless anyway.
 + libpanel-applet doesn't depend on libgnomeui anymore. This might have some
   build-time and run-time side-effects:
   - build-time: the pkg-config check for libpanelapplet-2.0 won't bring
     libgnomeui anymore. The fix is to have the applet configure script check
     for libgnomeui itself if it needs it.
   - build-time: panel-applet.h doesn't contain some #include for some
     libgnomeui part anymore. The fix is to have the relevant applet code
     include the right headers it needs.
   - run-time: the macro defined in panel-applet.h and used by nearly all
     applets to start the applet (PANEL_APPLET_BONOBO_FACTORY) used to call
     gnome_program_init(), and it's not the case anymore. If the applet uses
     some libgnomeui widgets, there might be warnings because some of those
     require some libgnomeui initialization. The fix is to either port the
     applet to GTK+ widgets, or to have it called gnome_program_init() on its
     own.
   This last item could arguably be seen as an API change. If this causes too
   many issues, another solution might be considered.


  Panel

	* Use C_() instead of Q_() (Philip Withnall, Vincent)
	* Fix compilation warnings (Vincent)
	* Use dbus-based uniquification instead of bonobo-based (Colin Walters,
	  Vincent)
	* Add a --replace argument to replace the current panel instead of just
	  leaving (Vincent)
	* Remove unneeded call to gnome_authentication_manager_init() (we use
	  gio now) (Vincent)
	* Set an application name (Vincent)
	* Code cleanup (Vincent)
	* Use single include for glib and gtk+ (Vincent)
	* Stop using many deprecated API (Vincent)
	* Start removing calls to libgnome/libgnomeui API (Vincent)
	* Use gio to launch desktop files, instead of gnome-desktop (Vincent)
	* Stop using gnome_help_display_desktop_on_screen() and get rid of
	  libgnomeui dependency (Vincent)
	* Fix help for "connect to server" (Vincent)

  libpanel-applet

	* Use C_() instead of Q_() (Philip Withnall, Vincent)
	* Use single include for glib and gtk+ (Vincent)
	* Stop using many deprecated API (Vincent)
	* Code cleanup (Vincent)
	* Do not depend on libgnome/libgnomeui anymore [note that we still have
	  an indirect libgnome dependency, through bonobo] (Vincent)

  All Applets

	* Use single include for glib and gtk+ (Vincent)
	* Stop using gnome_help_display_desktop_on_screen() and get rid of
	  libgnomeui dependency (Vincent)

  Clock Applet

	* Add some inline documentation to the edit location window (Dan
	  Winship)
	* Remove fixed width for buttons in the pref dialog (Gabor Kelemen)
	* Build fixes (Vincent)
	* Stop using deprecated GTK+ API (Vincent)
	* Show day of week header in "set time" calendar (Vincent)

  Fish Applet

	* Fix compilation warnings (Vincent)

  Notification Area Applet

	* Real tray icons transparency (Owen Taylor)
	* Fix compilation warnings (Vincent)
	* Stop using deprecated GTK+ API (Vincent)

  Wnck Applets

	* Use the right help file for some help buttons (Vincent)
	* Make sure dialogs have the right window icon (Vincent)

  Misc

	* Require glib 2.18.0 (Vincent)
	* Remove obsolete german translation of documentation (Vincent)
	* Stop declaring a bonobo PanelShell interface (Vincent)
	* libpanel-applet and all applets in gnome-panel lose their libgnomeui
	  dependency (Vincent)

  Translators

	* Yair Hershkovitz (he)
	* Leonardo Ferreira Fontenelle (pt_BR)

4 files changed, 107 insertions, 42 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 382d67e8394..503e45c9e08 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2009/01/25 17:03:31 drochner Exp $
+# $NetBSD: Makefile,v 1.107 2009/03/16 23:49:20 jmcneill Exp $
 #
 
-DISTNAME=		gnome-panel-2.24.3
-PKGREVISION=		1
+DISTNAME=		gnome-panel-2.26.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -42,17 +41,18 @@ BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.5.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.0
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-panel
-PKG_SUPPORTED_OPTIONS=	evolution hal
-PKG_SUGGESTED_OPTIONS=	evolution hal
-PLIST_VARS+=		hal
+PKG_SUPPORTED_OPTIONS=	evolution
+PKG_SUGGESTED_OPTIONS=	evolution
+
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mhal)
-.include "../../security/policykit/buildlink3.mk"
-.include "../../security/policykit-gnome/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
-PLIST.hal=		yes
-.endif
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
@@ -74,8 +74,11 @@ BUILDLINK_API_DEPENDS.libgweather+=	libgweather>=2.24.1
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .endif
 .include "../../net/ORBit2/buildlink3.mk"
+.include "../../security/policykit/buildlink3.mk"
+.include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
+.include "../../sysutils/hal/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index bd78eccb5d5..1f7da9e9e52 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2009/01/14 09:11:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.44 2009/03/16 23:49:20 jmcneill Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -9,20 +9,19 @@ include/panel-2.0/panel-applet.h
 lib/bonobo/servers/GNOME_ClockApplet_Factory.server
 lib/bonobo/servers/GNOME_FishApplet_Factory.server
 lib/bonobo/servers/GNOME_NotificationAreaApplet.server
-lib/bonobo/servers/GNOME_Panel.server
 lib/bonobo/servers/GNOME_Wncklet_Factory.server
 lib/libpanel-applet-2.la
 lib/pkgconfig/libpanelapplet-2.0.pc
 libexec/clock-applet
 libexec/fish-applet-2
-${PLIST.hal}libexec/gnome-clock-applet-mechanism
+libexec/gnome-clock-applet-mechanism
 libexec/notification-area-applet
 libexec/wnck-applet
 man/man1/gnome-panel.1
-${PLIST.hal}share/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+share/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
 share/applications/gnome-panel.desktop
-${PLIST.hal}share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-${PLIST.hal}share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf
+share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
 share/gconf/schemas/panel-compatibility.schemas
@@ -77,15 +76,24 @@ share/gnome/help/clock/ar/legal.xml
 share/gnome/help/clock/ca/clock.xml
 share/gnome/help/clock/ca/figures/clock_applet.png
 share/gnome/help/clock/ca/legal.xml
+share/gnome/help/clock/cs/clock.xml
+share/gnome/help/clock/cs/figures/clock_applet.png
+share/gnome/help/clock/cs/legal.xml
 share/gnome/help/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
 share/gnome/help/clock/de/legal.xml
 share/gnome/help/clock/el/clock.xml
 share/gnome/help/clock/el/figures/clock_applet.png
 share/gnome/help/clock/el/legal.xml
+share/gnome/help/clock/en_GB/clock.xml
+share/gnome/help/clock/en_GB/figures/clock_applet.png
+share/gnome/help/clock/en_GB/legal.xml
 share/gnome/help/clock/es/clock.xml
 share/gnome/help/clock/es/figures/clock_applet.png
 share/gnome/help/clock/es/legal.xml
+share/gnome/help/clock/eu/clock.xml
+share/gnome/help/clock/eu/figures/clock_applet.png
+share/gnome/help/clock/eu/legal.xml
 share/gnome/help/clock/fi/clock.xml
 share/gnome/help/clock/fi/figures/clock_applet.png
 share/gnome/help/clock/fi/legal.xml
@@ -134,10 +142,6 @@ share/gnome/help/clock/zh_CN/legal.xml
 share/gnome/help/clock/zh_TW/clock.xml
 share/gnome/help/clock/zh_TW/figures/clock_applet.png
 share/gnome/help/clock/zh_TW/legal.xml
-share/gnome/help/fish-applet-2/de/figures/fish_applet.png
-share/gnome/help/fish-applet-2/de/figures/fish_settings.png
-share/gnome/help/fish-applet-2/de/fish-applet-2.xml
-share/gnome/help/fish-applet-2/de/legal.xml
 share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
 share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
 share/gnome/help/fish-applet-2/ja/legal.xml
@@ -161,9 +165,15 @@ share/gnome/help/fish/de/legal.xml
 share/gnome/help/fish/el/figures/fish_applet.png
 share/gnome/help/fish/el/fish.xml
 share/gnome/help/fish/el/legal.xml
+share/gnome/help/fish/en_GB/figures/fish_applet.png
+share/gnome/help/fish/en_GB/fish.xml
+share/gnome/help/fish/en_GB/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/eu/figures/fish_applet.png
+share/gnome/help/fish/eu/fish.xml
+share/gnome/help/fish/eu/legal.xml
 share/gnome/help/fish/fi/figures/fish_applet.png
 share/gnome/help/fish/fi/fish.xml
 share/gnome/help/fish/fi/legal.xml
@@ -194,14 +204,13 @@ share/gnome/help/fish/uk/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/window-list/ar/window-list.xml
 share/gnome/help/window-list/ca/window-list.xml
+share/gnome/help/window-list/cs/window-list.xml
 share/gnome/help/window-list/da/window-list.xml
-share/gnome/help/window-list/de/figures/window_list_applet.png
-share/gnome/help/window-list/de/figures/window_list_group.png
-share/gnome/help/window-list/de/figures/window_list_group_applet.png
-share/gnome/help/window-list/de/legal.xml
 share/gnome/help/window-list/de/window-list.xml
 share/gnome/help/window-list/el/window-list.xml
+share/gnome/help/window-list/en_GB/window-list.xml
 share/gnome/help/window-list/es/window-list.xml
+share/gnome/help/window-list/eu/window-list.xml
 share/gnome/help/window-list/fi/window-list.xml
 share/gnome/help/window-list/fr/window-list.xml
 share/gnome/help/window-list/it/window-list.xml
@@ -225,13 +234,13 @@ share/gnome/help/window-list/zh_TW/window-list.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ar/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
+share/gnome/help/workspace-switcher/cs/workspace-switcher.xml
 share/gnome/help/workspace-switcher/da/workspace-switcher.xml
-share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/de/legal.xml
 share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/el/workspace-switcher.xml
+share/gnome/help/workspace-switcher/en_GB/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/eu/workspace-switcher.xml
 share/gnome/help/workspace-switcher/fi/workspace-switcher.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -346,6 +355,7 @@ share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
@@ -365,12 +375,14 @@ share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
@@ -425,6 +437,7 @@ share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@@ -432,9 +445,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 share/omf/clock/clock-C.omf
 share/omf/clock/clock-ar.omf
 share/omf/clock/clock-ca.omf
+share/omf/clock/clock-cs.omf
 share/omf/clock/clock-de.omf
 share/omf/clock/clock-el.omf
+share/omf/clock/clock-en_GB.omf
 share/omf/clock/clock-es.omf
+share/omf/clock/clock-eu.omf
 share/omf/clock/clock-fi.omf
 share/omf/clock/clock-fr.omf
 share/omf/clock/clock-it.omf
@@ -455,7 +471,9 @@ share/omf/fish/fish-C.omf
 share/omf/fish/fish-ca.omf
 share/omf/fish/fish-de.omf
 share/omf/fish/fish-el.omf
+share/omf/fish/fish-en_GB.omf
 share/omf/fish/fish-es.omf
+share/omf/fish/fish-eu.omf
 share/omf/fish/fish-fi.omf
 share/omf/fish/fish-fr.omf
 share/omf/fish/fish-it.omf
@@ -465,24 +483,24 @@ share/omf/fish/fish-ru.omf
 share/omf/fish/fish-sv.omf
 share/omf/fish/fish-th.omf
 share/omf/fish/fish-uk.omf
-share/omf/gnome-panel/fish-applet-2-de.omf
 share/omf/gnome-panel/fish-applet-2-ja.omf
 share/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/omf/gnome-panel/window-list-de.omf
 share/omf/gnome-panel/window-list-ja.omf
 share/omf/gnome-panel/window-list-zh_TW.omf
-share/omf/gnome-panel/workspace-switcher-de.omf
 share/omf/gnome-panel/workspace-switcher-ja.omf
 share/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/omf/window-list/window-list-C.omf
 share/omf/window-list/window-list-ar.omf
 share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-cs.omf
 share/omf/window-list/window-list-da.omf
 share/omf/window-list/window-list-de.omf
 share/omf/window-list/window-list-el.omf
+share/omf/window-list/window-list-en_GB.omf
 share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-eu.omf
 share/omf/window-list/window-list-fi.omf
 share/omf/window-list/window-list-fr.omf
 share/omf/window-list/window-list-it.omf
@@ -497,10 +515,13 @@ share/omf/window-list/window-list-zh_CN.omf
 share/omf/workspace-switcher/workspace-switcher-C.omf
 share/omf/workspace-switcher/workspace-switcher-ar.omf
 share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-cs.omf
 share/omf/workspace-switcher/workspace-switcher-da.omf
 share/omf/workspace-switcher/workspace-switcher-de.omf
 share/omf/workspace-switcher/workspace-switcher-el.omf
+share/omf/workspace-switcher/workspace-switcher-en_GB.omf
 share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-eu.omf
 share/omf/workspace-switcher/workspace-switcher-fi.omf
 share/omf/workspace-switcher/workspace-switcher-fr.omf
 share/omf/workspace-switcher/workspace-switcher-it.omf
@@ -513,7 +534,6 @@ share/omf/workspace-switcher/workspace-switcher-ru.omf
 share/omf/workspace-switcher/workspace-switcher-sv.omf
 share/omf/workspace-switcher/workspace-switcher-uk.omf
 share/omf/workspace-switcher/workspace-switcher-vi.omf
-${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/omf/workspace-switcher
 @dirrm share/omf/window-list
 @dirrm share/omf/gnome-panel
@@ -523,12 +543,19 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/idl/gnome-panel-2.0
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gtk-doc/html/panel-applet
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
@@ -548,11 +575,13 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome/help/workspace-switcher/it
 @dirrm share/gnome/help/workspace-switcher/fr
 @dirrm share/gnome/help/workspace-switcher/fi
+@dirrm share/gnome/help/workspace-switcher/eu
 @dirrm share/gnome/help/workspace-switcher/es
+@dirrm share/gnome/help/workspace-switcher/en_GB
 @dirrm share/gnome/help/workspace-switcher/el
-@dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
 @dirrm share/gnome/help/workspace-switcher/da
+@dirrm share/gnome/help/workspace-switcher/cs
 @dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/ar
 @dirrm share/gnome/help/workspace-switcher/C
@@ -572,11 +601,13 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome/help/window-list/it
 @dirrm share/gnome/help/window-list/fr
 @dirrm share/gnome/help/window-list/fi
+@dirrm share/gnome/help/window-list/eu
 @dirrm share/gnome/help/window-list/es
+@dirrm share/gnome/help/window-list/en_GB
 @dirrm share/gnome/help/window-list/el
-@dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
 @dirrm share/gnome/help/window-list/da
+@dirrm share/gnome/help/window-list/cs
 @dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/ar
 @dirrm share/gnome/help/window-list/C
@@ -599,8 +630,12 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/fi/figures
 @dirrm share/gnome/help/fish/fi
+@dirrm share/gnome/help/fish/eu/figures
+@dirrm share/gnome/help/fish/eu
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/en_GB/figures
+@dirrm share/gnome/help/fish/en_GB
 @dirrm share/gnome/help/fish/el/figures
 @dirrm share/gnome/help/fish/el
 @dirrm share/gnome/help/fish/de/figures
@@ -615,8 +650,6 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome/help/fish-applet-2/zh_CN
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/de/figures
-@dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2
 @dirrm share/gnome/help/fish
 @dirrm share/gnome/help/clock/zh_TW/figures
@@ -651,12 +684,18 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome/help/clock/fr
 @dirrm share/gnome/help/clock/fi/figures
 @dirrm share/gnome/help/clock/fi
+@dirrm share/gnome/help/clock/eu/figures
+@dirrm share/gnome/help/clock/eu
 @dirrm share/gnome/help/clock/es/figures
 @dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/en_GB/figures
+@dirrm share/gnome/help/clock/en_GB
 @dirrm share/gnome/help/clock/el/figures
 @dirrm share/gnome/help/clock/el
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/cs/figures
+@dirrm share/gnome/help/clock/cs
 @dirrm share/gnome/help/clock/ca/figures
 @dirrm share/gnome/help/clock/ca
 @dirrm share/gnome/help/clock/ar/figures
@@ -669,7 +708,12 @@ ${PLIST.hal}@dirrm share/examples/gnome-panel
 @dirrm share/gnome-panel/glade
 @dirrm share/gnome-panel
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@comment in gnome2-dirs: @dirrm share/gnome-2.0
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
+@dirrm share/examples/gnome-panel
+@comment in dbus: @dirrm share/dbus-1/system-services
+@comment in dbus: @dirrm share/dbus-1
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/panel-2.0
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index f424a2742db..cff76d8246e 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2009/02/18 17:50:24 drochner Exp $
+$NetBSD: distinfo,v 1.53 2009/03/16 23:49:20 jmcneill Exp $
 
-SHA1 (gnome-panel-2.24.3.tar.bz2) = 46a115529c2e6ef5429e58e5389ad44660aff428
-RMD160 (gnome-panel-2.24.3.tar.bz2) = ac38a86fd844d4e7d27c9785dc27a0327d83809f
-Size (gnome-panel-2.24.3.tar.bz2) = 3354686 bytes
+SHA1 (gnome-panel-2.26.0.tar.bz2) = 8b3012a1f080cb7b30c25d867ca371119fc538f4
+RMD160 (gnome-panel-2.26.0.tar.bz2) = 5c25eaeba9886d3cccf189f2304581e6a277afd6
+Size (gnome-panel-2.26.0.tar.bz2) = 3421179 bytes
 SHA1 (patch-aa) = e19be3cb14a38e1ea98f368a1fd1f53e1a7d6513
 SHA1 (patch-ab) = 681079355d2f10f4ae40fa90772f457a1fc42f41
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
diff --git a/x11/gnome-panel/files/msgfmtstrip b/x11/gnome-panel/files/msgfmtstrip
new file mode 100644
index 00000000000..950ff7540cb
--- /dev/null
+++ b/x11/gnome-panel/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/16 23:49:20 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}