Update to 2.14.0:

==============
Version 2.14.0
==============

  Panel

	* Remove the Suspend button on the logout dialog (this is not a
	  regression wrt 2.12) (Vincent)
	* Ignore unknown options passed to the panel (Ray Strode)
	* Fix orientation of handles (Benjamin Berg, Vincent)
	* Fix help link for the menubar (Vincent)
	* Fix underscores not being visible in menu items (Vincent)

  Workspace Switcher Applet

	* Fix crash when scrolling right on the last workspace (Benjamin Berg)

  Misc

	* Update manpage (Vincent)

  Translators

	* Vital Khilko (be)
	* Vladimir Petkov (bg)
	* Runa Bhattacharjee (bn)
	* Petr Tomeš (cs)
	* Rhys Jones (cy)
	* Ole Laursen (da)
	* Hendrik Richter (de)
	* Kostas Papadimas (el)
	* Francisco Javier F. Serrador (es)
	* Ivar Smolin (et)
	* Iñaki Larrañaga (eu)
	* Ilkka Tuohela (fi)
	* Ankit Patel (gu)
	* Rajesh Ranjan (hi)
	* Mate ORY (hu)
	* Luca Ferretti (it)
	* Takeshi AIHANA (ja)
	* Vladimer SIchinava (ka)
	* Erdal Ronahi (ku)
	* Žygimantas Beručka (lt)
	* Øivind Hoel (nb)
	* Tino Meinen (nl)
	* Åsmund Skjæveland (nn)
	* Øivind Hoel (no)
	* Gnome PL Team (pl)
	* Evandro Fernandes Giovanini (pt_BR)
	* Duarte Loreto (pt)
	* Leonid Kanter (ru)
	* Elian Myftiu (sq)
	* Слободан Д. Средојевић (sr)
	* Daniel Nylander (sv)
	* Theppitak Karoonboonyanan (th)
	* Maxim Dziumanenko (uk)
	* Clytie Siddall (vi)
	* Funda Wang (zh_CN)
	* Woodman Tuen (zh_HK)
	* Woodman Tuen (zh_TW)

===============
Version 2.13.91
===============

  Panel

	* Use Restart instead of Reboot (Vincent)
	* Remove the Shut Down reference in the tooltip of the Log Out item
	  (Vincent)
	* Don't reboot/shutdown immediately if other users are connected
	  (Vincent)
	* Don't display the Shut Down item if GDM is not running (Vincent)
	* Use a softer countdown for the 30 first seconds in the log out
	  dialogs (Vincent)
	* Fix critical warning in the run dialog when the program list is
	  disabled (Vincent)
	* Add "..." at the end of the Log Out and Shut Down items (Vincent)
	* Make invisible mnemonics in menu work again (Matthias Clasen,
	  Vincent)
	* Add accelerator for items in the context menu of launchers (Vincent)
	* Use GOption instead of popt (Vincent)

  Fish Applet

	* Use gender-neutral wording in about dialog (Vincent)

  Window Menu Applet

	* Update help link (Vincent)

  Misc

	* Use GOption instead of popt in the test applet program (Vincent)
	* Fix build when /usr/lib/X11R6 is a link to /usr (Vincent)

  Docs Translators

	* Luca Ferretti (it)

  Translators

	* Runa Bhattacharjee (bn)
	* Jordi Mallach (ca)
	* Miloslav Trmac (cs)
	* Ole Laursen (da)
	* Ivar Smolin (et)
	* Ignacio Casal Quinteiro (gl)
	* Luca Ferretti (it)
	* Øivind Hoel (nb)
	* Evandro Fernandes Giovanini (pt_BR)
	* Слободан Д. Средојевић (sr)
	* Theppitak Karoonboonyanan (th)

===============
Version 2.13.90
===============

  Panel

	* Fix timeout label in the logout dialogs (Vincent)
	* Don't make it possible to have two logout dialogs at the same time
	  (Vincent)
	* Put logout dialogs above all windows and on all workspaces (Vincent)
	* Show the logout dialog on the correct screen (Vincent)
	* Fix crash with logout dialogs when esd and sound events are enabled
	  (Vincent)
	* Simplify the logout dialogs questions (Dennis Cranston)
	* Partial fix for Vincent's stupidity :-) (Elijah Newren)
	* Fix search of application launchers in "Add to panel" dialog
	  (Vincent)
	* Fix potential crash when there's an error loading an applet (Vincent)
	* Update libegg code (Vincent)
	* Fix crash when logout dialogs are closed by the window manager
	  (Vincent)
	* Remove gnome-screenshot item from the Desktop menu (Vincent)
	* Look in the XDG data dirs when loading a .desktop file, so we don't
	  need the whole path (Vincent)
	* Update default panel config to just use basenames for .desktop files
	  (Vincent)
	* Remove the screenshot action button and migrates the existing config
	  to use gnome-screenshot.desktop (Vincent)
	* Change accelerator for "Lock To Panel" (Vincent)
	* Add username to the Logout menu item (Vincent)
	* Fix crash happening with remote bookmarks in the Places menu
	  (Vincent)
	* Use an icon for the network places submenu (Vincent)
	* Update the launcher item description in the "Add to panel" dialog
	  (Vincent)
	* Simplify and add context for some strings (Vincent)
	* Fix warnings (Vincent, Jens Granseuer, Kjartan Maraas)
	* Don't show useless separators in context menus of panel objects when
	  the panel is locked down (Vincent)
	* Fix theoretical breakage if gconf config is broken (Vincent)

  Clock Applet

	* Fix incoherency in the use of two lines format (Vincent)
	* Don't offer the 12-hour format to the user if his locale don't
	  support it (Vincent)

  Misc

	* Add context in some strings of the test applet program (Vincent)

  Docs Translators

	* Vincent Untz (fr)

  Translators

	* Vital Khilko (be)
	* Vladimir Petkov (bg)
	* Hendrik Brandt (de)
	* Kostas Papadimas (el)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Ilkka Tuohela (fi)
	* Ignacio Casal Quinteiro (gl)
	* Ankit Patel (gu)
	* Luca Ferretti (it)
	* Takeshi AIHANA (ja)
	* Žygimantas Beručka (lt)
	* Øivind Hoel (nb)
	* Reinout van Schouwen (nl)
	* Øivind Hoel (no)
	* Evandro Fernandes Giovanini (pt_BR)
	* Слободан Д. Средојевић (sr)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)
	* Funda Wang (zh_CN)

==============
Version 2.13.5
==============

  Panel

	* Remove useless screensaver actions in context menu of the button
	  (William Jon McCann)
	* Fix tiling for image backgrounds (Vincent)
	* Update background when size changes (Vincent)
	* Make image with transparency backgrounds work (Vincent)
	* Fix critical warnings (Vincent)
	* Add CD recording item to the Places menu (Sébastien Bacher)
	* Add separator internal applet (Carlos Garcia Campos, Manu Cornet,
	  Vincent)
	* Add a search entry to the "add to panel" dialog (Vincent)
	* Re-cache the applications menu when reloading it after there has been
	  some fam/gamin/inotify events (Vincent)
	* Add new logout/shutdown dialogs (Vincent)
	* Fix display of remote bookmarks in Places menu (Bastien Nocera,
	  Vincent)
	* Small fixes (Vincent)

  libpanel-applet

	* Fix tiling for image backgrounds (Vincent)
	* Avoid crashes with image backgrounds (Vincent)

  Wnck Applets

	* tell libwnck that the applets are pagers (Elijah Newren)

  Documentation

	* Update for clock and fish applets (Joachim Noreiko)

  Misc

	* Depend on libwnck 2.13.5 (Vincent)

  Docs Translators

	* Christophe Bliard (fr)

  Translators

	* Vladimir Petkov (bg)
	* Jordi Mallach (ca)
	* Hendrik Richter (de)
	* Adam Weinberger (en_CA)
	* Ilkka Tuohela (fi)
	* Ignacio Casal Quinteiro (gl)
	* Gabor Kelemen (hu)
	* Takeshi AIHANA (ja)
	* Reinout van Schouwen (nl)
	* Слободан Д. Средојевић (sr)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)
	* Woodman Tuen (zh_HK)
	* Woodman Tuen (zh_TW)

==============
Version 2.13.4
==============

  Panel

	* Don't crash when an applet can't be loaded (Crispin Flowerday)
	* Fix critical warnings (Vincent, Claudio Saavedra)
	* Remove useless warning (Vincent)
	* Add a preview widget in the image background chooser (Vincent)
	* Don't crash with some themes (Vincent, Benjamin Berg)
	* Fix sensitivity of "Remove panel" menu item (Vincent)
	* Reword error dialogs (Luke Worth, Vincent)
	* Update the known applications list while typing and only show the
	  items that match (Vincent)
	* Make the "add to panel" dialog a bit nicer (Vincent)
	* Use a close button instead of the cancel one in the "add to panel"
	  dialog (Claudio Saavedra)
	* Add tooltips for the menu bar (Vincent, Christian Kirbach)
	* Update from libegg (Vincent)
	* Don't do something on double/triple clicks for buttons (Vincent)
	* Make applet handles handle transparency (Ryan Lortie, Vincent)
	* Fix crash when a toplevel is destroyed (Vincent)
	* Fix crash when quitting with "add to dialog" open (Vincent)
	* Fix auto-hide panel not autohiding after the "Delete dialog" has been
	  opened (Vincent)
	* Minor fixes (Vincent)
	* Code cleanups (Vincent)

  libpanel-applet

	* Add new API to automatically update the background of a widget
	  (Ryan Lortie, Vincent)
	* Emits the background-changed signal when the allocated size changes
	  (Ryan Lortie)
	* Fix criticla warning (Vincent)

  Clock Applet

	* Make task activation work correctly (William Jon McCann)
	* Sort tasks by due date if priorities are the same (kraai@ftbfs.org)
	* Don't show the date by default (Vincent)

  Fish Applet

	* Fix path to cairo.h (Vincent)
	* Fix critical warning when choosing a new image (Vincent)

  Notification Area Applet

	* Update from libegg. Should fix some icons not showing (Vincent)

  Window List Applet

	* Fix critical warning and icon not showing during startup notification
	  (Vincent)

  All Applets

	* use new libpanel-applet API for the background (Vincent)

  Documentation

	* Update for clock and fish applets (Luca Ferretti, Brent Smith)

  Misc

	* change button order and use Execute button for the test applet
	  program (Vincent)
	* don't crash when an applet can't be loaded in the test applet program
	  (Vincent)
	* Build fixes (Vincent)

  Docs Translators

	* Christophe Bliard (fr)

  Translators

	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Ilkka Tuohela (fi)
	* Ignacio Casal Quinteiro (gl)
	* Ankit Patel (gu)
	* Takeshi AIHANA (ja)
	* Žygimantas Beručka (lt)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)
	* Funda Wang (zh_CN)

==============
Version 2.13.3
==============

  Panel

	* Code cleanups (Vincent)
	* Synchronize the way remote bookmarks are displayed with nautilus
	  (Vincent)
	* Remove deprecated calls (Vincent)
	* Update libegg code (Vincent)

  Clock Applet

	* Really fix the orientation change (Vincent)

  Misc

	* Remove the .spec file (Vincent)
	* Build fixes (Vincent)

  Docs Translators

	* Christophe Bliard (fr)

  Translators

	* Vladimir Petkov (bg)
	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Elnaz Sarbar (fa)
	* Ignacio Casal Quinteiro (gl)
	* Ankit Patel (gu)
	* Takeshi AIHANA (ja)
	* Timur Jamakeev (ky)
	* Žygimantas Beručka (lt)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Marcel Telka (sk)
	* Elian Myftiu (sq)
	* Theppitak Karoonboonyanan (th)
	* Funda Wang (zh_CN)

==============
Version 2.13.2
==============

  Panel

	* Don't display error when an url show is canceled (Christian Neumair)
	* Handle glade errors (Christian Neumair)
	* Revert orientation change (Vincent)
	* Update libegg code (Vincent)

  Clock Applet

	* Updates for the orientation change (Vincent)

  Fish Applet

	* Updates for the orientation change (Vincent)

  Translators

	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Ivar Smolin (et)
	* Timur Jamakeev (ky)
	* Žygimantas Beručka (lt)
	* Marcel Telka (sk)
	* Theppitak Karoonboonyanan (th)

==============
Version 2.13.1
==============

  Panel

	* Fix bookmarks with spaces (Vincent)
	* Display bookmarks in the same way than nautilus (Vincent)
	* Remove useless code (Kjartan)
	* Don't change the drawer icon if the icon gconf key changed but we're
	not using the icon (Kjartan)
	* Plug leak (Kjartan)
	* Don't set the background multiple times on startup (Vincent)
	* Fix searching in the application list of the run dialog (Vincent)
	* Change default panel size to 24 (Vincent)
	* Change the way we report orientation to applets (Vincent)
	* Minor fixes/cleanups (Vincent)

  Clock Applet

	* Remove deprecated calls (Vincent)
	* Updates for the orientation change (Vincent)

  Fish Applet

	* Do not use deprecated widgets (Vincent)
	* Use cairo instead of libart (Vincent)

  Misc

	* Fix gnome-desktop version requirement (Frederic Crozat)
	* Build fixes/updates (Vincent)
	* Better descriptions for help files (Brent Smith)
	* libegg updates (Vincent)

  Translators

	* Vladimir Petkov (bg)
	* Runa Bhattacharjee (bn)
	* Adam Weinberger (en_CA)
	* Ivar Smolin (et)
	* Reinout van Schouwen (nl)
	* Christian Rose (sv)

4 files changed, 38 insertions, 28 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 8cf4cd3a725..52486406c86 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2006/03/21 06:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2006/03/30 21:15:59 jmmv Exp $
 #
 
-DISTNAME=		gnome-panel-2.12.3
-PKGREVISION=		2
+DISTNAME=		gnome-panel-2.14.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.14/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE=	libpanel-applet/libpanelapplet-2.0.pc.in
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
+CPPFLAGS+=	-DPANEL_GNOME_LOGO_ICON="\"netbsd-logo-icon-transparent\""
+
 GCONF2_SCHEMAS= 	clock.schemas
 GCONF2_SCHEMAS+=	fish.schemas
 GCONF2_SCHEMAS+=	panel-global.schemas
@@ -34,7 +35,8 @@ GCONF2_ENTRIES=		panel-default-setup.entries
 
 BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.5.0
-BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.12.1
+BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.13.0
+BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.13.5
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -45,6 +47,7 @@ BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.12.1
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index db39d76e6d8..66e55884f61 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2006/02/08 18:41:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2006/03/30 21:15:59 jmmv Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -102,10 +102,6 @@ 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/fr/figures/fish_applet.png
-share/gnome/help/fish-applet-2/fr/figures/fish_settings.png
-share/gnome/help/fish-applet-2/fr/fish-applet-2.xml
-share/gnome/help/fish-applet-2/fr/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
@@ -131,6 +127,9 @@ share/gnome/help/fish/C/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/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
@@ -151,7 +150,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png
 share/gnome/help/window-list/es/legal.xml
 share/gnome/help/window-list/es/window-list.xml
 share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group.png
 share/gnome/help/window-list/fr/figures/window_list_group_applet.png
 share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
@@ -198,7 +196,6 @@ share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/es/legal.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
 share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/fr/legal.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
@@ -245,6 +242,7 @@ share/icons/hicolor/48x48/apps/gnome-fish.png
 share/icons/hicolor/48x48/apps/gnome-gegl.png
 share/icons/hicolor/48x48/apps/gnome-main-menu.png
 share/icons/hicolor/48x48/apps/panel-force-quit.png
+share/icons/hicolor/48x48/apps/panel-separator.png
 share/idl/gnome-panel-2.0/GNOME_Panel.idl
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
@@ -282,6 +280,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
+${PKGLOCALEDIR}/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
@@ -341,31 +340,22 @@ share/omf/clock/clock-zh_CN.omf
 share/omf/clock/clock-zh_TW.omf
 share/omf/fish/fish-C.omf
 share/omf/fish/fish-es.omf
+share/omf/fish/fish-fr.omf
 share/omf/fish/fish-it.omf
 share/omf/fish/fish-uk.omf
-share/omf/gnome-panel/clock-de.omf
-share/omf/gnome-panel/clock-fr.omf
-share/omf/gnome-panel/clock-ja.omf
-share/omf/gnome-panel/clock-ko.omf
-share/omf/gnome-panel/clock-sv.omf
-share/omf/gnome-panel/clock-zh_CN.omf
-share/omf/gnome-panel/clock-zh_TW.omf
 share/omf/gnome-panel/fish-applet-2-de.omf
-share/omf/gnome-panel/fish-applet-2-fr.omf
 share/omf/gnome-panel/fish-applet-2-ja.omf
 share/omf/gnome-panel/fish-applet-2-ko.omf
 share/omf/gnome-panel/fish-applet-2-sv.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-fr.omf
 share/omf/gnome-panel/window-list-ja.omf
 share/omf/gnome-panel/window-list-ko.omf
 share/omf/gnome-panel/window-list-sv.omf
 share/omf/gnome-panel/window-list-zh_CN.omf
 share/omf/gnome-panel/window-list-zh_TW.omf
 share/omf/gnome-panel/workspace-switcher-de.omf
-share/omf/gnome-panel/workspace-switcher-fr.omf
 share/omf/gnome-panel/workspace-switcher-ja.omf
 share/omf/gnome-panel/workspace-switcher-ko.omf
 share/omf/gnome-panel/workspace-switcher-sv.omf
@@ -373,10 +363,12 @@ 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-es.omf
+share/omf/window-list/window-list-fr.omf
 share/omf/window-list/window-list-it.omf
 share/omf/window-list/window-list-uk.omf
 share/omf/workspace-switcher/workspace-switcher-C.omf
 share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-fr.omf
 share/omf/workspace-switcher/workspace-switcher-it.omf
 share/omf/workspace-switcher/workspace-switcher-nl.omf
 share/omf/workspace-switcher/workspace-switcher-uk.omf
@@ -444,6 +436,8 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/it/figures
 @dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
 @dirrm share/gnome/help/fish/C/figures
@@ -458,8 +452,6 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/fish-applet-2/ko
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/fr/figures
-@dirrm share/gnome/help/fish-applet-2/fr
 @dirrm share/gnome/help/fish-applet-2/de/figures
 @dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 7b5bca96a9b..dbea9495f51 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.25 2006/02/08 18:41:11 drochner Exp $
+$NetBSD: distinfo,v 1.26 2006/03/30 21:15:59 jmmv Exp $
 
-SHA1 (gnome-panel-2.12.3.tar.bz2) = 22e1dc46d16980d6a90f9c4d89296232da2e43aa
-RMD160 (gnome-panel-2.12.3.tar.bz2) = 7f38160cc00af55af9c5156b2c4021085260436d
-Size (gnome-panel-2.12.3.tar.bz2) = 2464381 bytes
+SHA1 (gnome-panel-2.14.0.tar.bz2) = a6cdcd381e3f6ce905f71e28740cd51c43b6502f
+RMD160 (gnome-panel-2.14.0.tar.bz2) = a3b635693b5dd010835a64f476991f9cf32821e9
+Size (gnome-panel-2.14.0.tar.bz2) = 2466152 bytes
+SHA1 (patch-aa) = 92481f648bb093f1d11ea220490a6c92c25ffe1d
diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa
new file mode 100644
index 00000000000..5605ddf58dd
--- /dev/null
+++ b/x11/gnome-panel/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2006/03/30 21:16:00 jmmv Exp $
+
+--- gnome-panel/panel-menu-bar.h.orig	2005-07-26 11:26:17.000000000 +0200
++++ gnome-panel/panel-menu-bar.h
+@@ -30,7 +30,9 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef PANEL_GNOME_LOGO_ICON
+ #define PANEL_GNOME_LOGO_ICON "gnome-logo-icon-transparent"
++#endif
+ 
+ #define PANEL_TYPE_MENU_BAR         (panel_menu_bar_get_type ())
+ #define PANEL_MENU_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_MENU_BAR, PanelMenuBar))