Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

5 files changed, 199 insertions, 201 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index ad6f6de021a0..b9aa1f0997fd 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.146 2007/03/14 21:00:05 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.161 2007/10/15 21:34:24 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index ddf8ddfd5f63..1f542a4af209 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.18.3.tar.bz2) = 545348de234fa8222e328fa7f3a5ba71
-SHA256 (gnome2/gnome-panel-2.18.3.tar.bz2) = efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
-SIZE (gnome2/gnome-panel-2.18.3.tar.bz2) = 2722555
+MD5 (gnome2/gnome-panel-2.20.1.tar.bz2) = 87ef96c2cbb8ecaa328420c0d31cc4c0
+SHA256 (gnome2/gnome-panel-2.20.1.tar.bz2) = 3ec39b085b905946fa891cb01ae320166a85e11e850f29bf622057a00a4d1b01
+SIZE (gnome2/gnome-panel-2.20.1.tar.bz2) = 2820992
diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po
index 1d3343b4140e..5a71e3919398 100644
--- a/x11/gnome-panel/files/patch-po_ja.po
+++ b/x11/gnome-panel/files/patch-po_ja.po
@@ -1,20 +1,20 @@
---- po/ja.po.orig	Mon Mar  7 23:15:19 2005
-+++ po/ja.po	Fri Apr  8 14:12:28 2005
-@@ -105,7 +105,7 @@
+--- po/ja.po.orig	2007-08-13 19:37:02.000000000 -0400
++++ po/ja.po	2007-08-14 17:00:06.000000000 -0400
+@@ -97,7 +97,7 @@ msgstr "%k:%M"
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:234
+ msgid "%b %d"
+-msgstr "%b%e日"
++msgstr "%B%e日"
+ 
+ #: ../applets/clock/calendar-window.c:742
+ msgid "_Tasks"
+@@ -138,7 +138,7 @@ msgstr "%k:%M:%S"
  #.
- #: ../applets/clock/clock.c:281
+ #: ../applets/clock/clock.c:369
  msgid "%a %b %e"
 -msgstr "%b%e日 (%a)"
 +msgstr "%B%e日 (%a)"
  
  #. translators: reverse the order of these arguments
  #. *              if the time should come before the
-@@ -138,7 +138,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:591
- msgid "%b %d"
--msgstr "%b%e日"
-+msgstr "%B%e日"
- 
- #: ../applets/clock/clock.c:890
- msgid "Tasks"
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
index 7dbd45da700a..45d98a92c0be 100644
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ b/x11/gnome-panel/files/patch-po_ko.po
@@ -1,38 +1,38 @@
---- po/ko.po.orig	Wed Sep 21 02:37:42 2005
-+++ po/ko.po	Fri Feb  3 15:58:18 2006
-@@ -98,7 +98,7 @@
+--- po/ko.po.orig	Sun Jul  8 18:23:19 2007
++++ po/ko.po	Sun Jul  8 18:26:46 2007
+@@ -88,7 +88,7 @@
+ #. * possible.
+ #: ../applets/clock/calendar-window.c:233
+ msgid "%b %d"
+-msgstr "%b %e일"
++msgstr "%B %e일"
+ 
+ #: ../applets/clock/calendar-window.c:741
+ msgid "_Tasks"
+@@ -129,7 +129,7 @@
  #.
- #: ../applets/clock/clock.c:279
+ #: ../applets/clock/clock.c:367
  msgid "%a %b %e"
 -msgstr "%b %e일 (%a)"
 +msgstr "%B %e일 (%a)"
  
  #. translators: reverse the order of these arguments
  #. *              if the time should come before the
-@@ -125,7 +125,7 @@
+@@ -156,7 +156,7 @@
  #. Show date in tooltip
- #: ../applets/clock/clock.c:378
+ #: ../applets/clock/clock.c:520
  msgid "%A %B %d"
 -msgstr "%b %e일 %A"
 +msgstr "%B %e일 %A"
  
- #: ../applets/clock/clock.c:390
- msgid "Click to view your appointments and tasks"
-@@ -139,7 +139,7 @@
- #. we will display the start date in the most abbreviated way possible.
- #: ../applets/clock/clock.c:598
- msgid "%b %d"
--msgstr "%b %e일"
-+msgstr "%B %e일"
- 
- #: ../applets/clock/clock.c:925
- msgid "Tasks"
-@@ -171,7 +171,7 @@
+ #: ../applets/clock/clock.c:534
+ msgid "Click to hide your appointments and tasks"
+@@ -188,7 +188,7 @@
  
- #: ../applets/clock/clock.c:1767
+ #: ../applets/clock/clock.c:1073
  msgid "%A, %B %d %Y"
 -msgstr "%Y년 %b %e일 %A"
 +msgstr "%Y년 %B %e일 %A"
  
- #: ../applets/clock/clock.c:1824
+ #: ../applets/clock/clock.c:1148
  #, c-format
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 96b87b383e19..717d6d3cf887 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -24,22 +24,43 @@ libexec/clock-applet
 libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
-share/gnome/applications/gnome-panel.desktop
-share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-share/gnome/gnome-panelrc
+share/applications/gnome-panel.desktop
+share/gnome-2.0/ui/GNOME_ClockApplet.xml
+share/gnome-2.0/ui/GNOME_FishApplet.xml
+share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+share/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
+share/gnome-2.0/ui/GNOME_WindowListApplet.xml
+share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
+share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%%DATADIR%%/glade/fish.glade
+%%DATADIR%%/glade/panel-properties-dialog.glade
+%%DATADIR%%/glade/panel-run-dialog.glade
+%%DATADIR%%/glade/panel-test-applets.glade
+%%DATADIR%%/glade/timezone.glade
+%%DATADIR%%/glade/window-list.glade
+%%DATADIR%%/glade/workspace-switcher.glade
+%%DATADIR%%/pixmaps/fishanim.png
+%%DATADIR%%/pixmaps/footguy.png
+%%DATADIR%%/pixmaps/gnome-gegl2-2.png
+%%DATADIR%%/pixmaps/gnome-gegl2.png
+%%DATADIR%%/pixmaps/monkey.png
+%%DATADIR%%/pixmaps/oldwanda.png
+%%DATADIR%%/pixmaps/wanda.png
+%%DATADIR%%/pixmaps/world_map-960.png
+share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/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/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/es/clock.xml
 share/gnome/help/clock/es/figures/clock_applet.png
 share/gnome/help/clock/es/legal.xml
@@ -58,6 +79,9 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/nl/clock.xml
 share/gnome/help/clock/nl/figures/clock_applet.png
 share/gnome/help/clock/nl/legal.xml
+share/gnome/help/clock/oc/clock.xml
+share/gnome/help/clock/oc/figures/clock_applet.png
+share/gnome/help/clock/oc/legal.xml
 share/gnome/help/clock/pa/clock.xml
 share/gnome/help/clock/pa/figures/clock_applet.png
 share/gnome/help/clock/pa/legal.xml
@@ -86,10 +110,6 @@ 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
-share/gnome/help/fish-applet-2/ko/figures/fish_applet.png
-share/gnome/help/fish-applet-2/ko/figures/fish_settings.png
-share/gnome/help/fish-applet-2/ko/fish-applet-2.xml
-share/gnome/help/fish-applet-2/ko/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -101,6 +121,12 @@ share/gnome/help/fish-applet-2/zh_TW/legal.xml
 share/gnome/help/fish/C/figures/fish_applet.png
 share/gnome/help/fish/C/fish.xml
 share/gnome/help/fish/C/legal.xml
+share/gnome/help/fish/ca/figures/fish_applet.png
+share/gnome/help/fish/ca/fish.xml
+share/gnome/help/fish/ca/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/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
@@ -110,105 +136,66 @@ 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
+share/gnome/help/fish/ko/figures/fish_applet.png
+share/gnome/help/fish/ko/fish.xml
+share/gnome/help/fish/ko/legal.xml
+share/gnome/help/fish/oc/figures/fish_applet.png
+share/gnome/help/fish/oc/fish.xml
+share/gnome/help/fish/oc/legal.xml
 share/gnome/help/fish/sv/figures/fish_applet.png
 share/gnome/help/fish/sv/fish.xml
 share/gnome/help/fish/sv/legal.xml
 share/gnome/help/fish/uk/figures/fish_applet.png
 share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
-share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group_applet.png
-share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ca/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/es/figures/window_list_applet.png
-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/el/window-list.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_applet.png
-share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
-share/gnome/help/window-list/it/figures/window_list_applet.png
-share/gnome/help/window-list/it/figures/window_list_group_applet.png
-share/gnome/help/window-list/it/legal.xml
 share/gnome/help/window-list/it/window-list.xml
 share/gnome/help/window-list/ja/figures/window_list_applet.png
 share/gnome/help/window-list/ja/figures/window_list_group_applet.png
 share/gnome/help/window-list/ja/legal.xml
 share/gnome/help/window-list/ja/window-list.xml
-share/gnome/help/window-list/ko/figures/window_list_applet.png
-share/gnome/help/window-list/ko/figures/window_list_group.png
-share/gnome/help/window-list/ko/figures/window_list_group_applet.png
-share/gnome/help/window-list/ko/legal.xml
 share/gnome/help/window-list/ko/window-list.xml
-share/gnome/help/window-list/pa/figures/window_list_applet.png
-share/gnome/help/window-list/pa/figures/window_list_group_applet.png
-share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/oc/window-list.xml
 share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/ru/figures/window_list_applet.png
-share/gnome/help/window-list/ru/figures/window_list_group_applet.png
-share/gnome/help/window-list/ru/legal.xml
 share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/figures/window_list_applet.png
-share/gnome/help/window-list/sv/figures/window_list_group_applet.png
-share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/figures/window_list_applet.png
-share/gnome/help/window-list/uk/figures/window_list_group_applet.png
-share/gnome/help/window-list/uk/legal.xml
 share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
-share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
-share/gnome/help/window-list/zh_CN/legal.xml
 share/gnome/help/window-list/zh_CN/window-list.xml
 share/gnome/help/window-list/zh_TW/figures/window_list_applet.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
 share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ca/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/es/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/es/legal.xml
+share/gnome/help/workspace-switcher/el/workspace-switcher.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/legal.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
-share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/ja/legal.xml
 share/gnome/help/workspace-switcher/ja/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/ko/legal.xml
 share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/nl/legal.xml
 share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
 share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ru/legal.xml
 share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/uk/legal.xml
 share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
+share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -217,73 +204,6 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
-share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/gnome/omf/clock/clock-C.omf
-share/gnome/omf/clock/clock-de.omf
-share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-fr.omf
-share/gnome/omf/clock/clock-it.omf
-share/gnome/omf/clock/clock-ja.omf
-share/gnome/omf/clock/clock-ko.omf
-share/gnome/omf/clock/clock-nl.omf
-share/gnome/omf/clock/clock-pa.omf
-share/gnome/omf/clock/clock-ru.omf
-share/gnome/omf/clock/clock-sr.omf
-share/gnome/omf/clock/clock-sv.omf
-share/gnome/omf/clock/clock-uk.omf
-share/gnome/omf/clock/clock-zh_CN.omf
-share/gnome/omf/clock/clock-zh_TW.omf
-share/gnome/omf/fish/fish-C.omf
-share/gnome/omf/fish/fish-es.omf
-share/gnome/omf/fish/fish-fr.omf
-share/gnome/omf/fish/fish-it.omf
-share/gnome/omf/fish/fish-sv.omf
-share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
-share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
-share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/gnome/omf/gnome-panel/window-list-de.omf
-share/gnome/omf/gnome-panel/window-list-ja.omf
-share/gnome/omf/gnome-panel/window-list-ko.omf
-share/gnome/omf/gnome-panel/window-list-zh_TW.omf
-share/gnome/omf/gnome-panel/workspace-switcher-de.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
-share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
-share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
-share/gnome/omf/window-list/window-list-C.omf
-share/gnome/omf/window-list/window-list-es.omf
-share/gnome/omf/window-list/window-list-fr.omf
-share/gnome/omf/window-list/window-list-it.omf
-share/gnome/omf/window-list/window-list-pa.omf
-share/gnome/omf/window-list/window-list-ru.omf
-share/gnome/omf/window-list/window-list-sv.omf
-share/gnome/omf/window-list/window-list-uk.omf
-share/gnome/omf/window-list/window-list-zh_CN.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-pa.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-ru.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-sv.omf
-share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
-share/gnome/panel/glade/fish.glade
-share/gnome/panel/glade/panel-properties-dialog.glade
-share/gnome/panel/glade/panel-run-dialog.glade
-share/gnome/panel/glade/panel-test-applets.glade
-share/gnome/panel/glade/window-list.glade
-share/gnome/panel/glade/workspace-switcher.glade
-share/gnome/panel/pixmaps/fishanim.png
-share/gnome/panel/pixmaps/footguy.png
-share/gnome/panel/pixmaps/gnome-gegl2-2.png
-share/gnome/panel/pixmaps/gnome-gegl2.png
-share/gnome/panel/pixmaps/monkey.png
-share/gnome/panel/pixmaps/oldwanda.png
-share/gnome/panel/pixmaps/wanda.png
 share/icons/hicolor/16x16/apps/gnome-panel-clock.png
 share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
 share/icons/hicolor/16x16/apps/gnome-panel-fish.png
@@ -339,6 +259,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
 share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
 share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
 share/icons/hicolor/scalable/apps/gnome-panel.svg
+share/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -378,6 +299,7 @@ share/locale/id/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
 share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
@@ -405,6 +327,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
@@ -417,6 +340,8 @@ share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
 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
@@ -425,88 +350,147 @@ 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
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrm share/gnome/panel/pixmaps
-@dirrm share/gnome/panel/glade
-@dirrm share/gnome/omf/workspace-switcher
-@dirrm share/gnome/omf/window-list
-@dirrm share/gnome/omf/gnome-panel
-@dirrm share/gnome/omf/fish
-@dirrm share/gnome/omf/clock
-@dirrm share/gnome/idl/gnome-panel-2.0
+share/omf/clock/clock-C.omf
+share/omf/clock/clock-ca.omf
+share/omf/clock/clock-de.omf
+share/omf/clock/clock-el.omf
+share/omf/clock/clock-es.omf
+share/omf/clock/clock-fr.omf
+share/omf/clock/clock-it.omf
+share/omf/clock/clock-ja.omf
+share/omf/clock/clock-ko.omf
+share/omf/clock/clock-nl.omf
+share/omf/clock/clock-oc.omf
+share/omf/clock/clock-pa.omf
+share/omf/clock/clock-ru.omf
+share/omf/clock/clock-sr.omf
+share/omf/clock/clock-sv.omf
+share/omf/clock/clock-uk.omf
+share/omf/clock/clock-zh_CN.omf
+share/omf/clock/clock-zh_TW.omf
+share/omf/fish/fish-C.omf
+share/omf/fish/fish-ca.omf
+share/omf/fish/fish-el.omf
+share/omf/fish/fish-es.omf
+share/omf/fish/fish-fr.omf
+share/omf/fish/fish-it.omf
+share/omf/fish/fish-ko.omf
+share/omf/fish/fish-oc.omf
+share/omf/fish/fish-sv.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-ca.omf
+share/omf/window-list/window-list-de.omf
+share/omf/window-list/window-list-el.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-ko.omf
+share/omf/window-list/window-list-oc.omf
+share/omf/window-list/window-list-pa.omf
+share/omf/window-list/window-list-ru.omf
+share/omf/window-list/window-list-sv.omf
+share/omf/window-list/window-list-uk.omf
+share/omf/window-list/window-list-zh_CN.omf
+share/omf/workspace-switcher/workspace-switcher-C.omf
+share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-de.omf
+share/omf/workspace-switcher/workspace-switcher-el.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-ko.omf
+share/omf/workspace-switcher/workspace-switcher-nl.omf
+share/omf/workspace-switcher/workspace-switcher-oc.omf
+share/omf/workspace-switcher/workspace-switcher-pa.omf
+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
+@dirrm share/omf/workspace-switcher
+@dirrm share/omf/window-list
+@dirrm share/omf/gnome-panel
+@dirrm share/omf/fish
+@dirrm share/omf/clock
+@dirrm share/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/vi
 @dirrm share/gnome/help/workspace-switcher/uk
-@dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
-@dirrm share/gnome/help/workspace-switcher/ru/figures
 @dirrm share/gnome/help/workspace-switcher/ru
-@dirrm share/gnome/help/workspace-switcher/pa/figures
 @dirrm share/gnome/help/workspace-switcher/pa
-@dirrm share/gnome/help/workspace-switcher/nl/figures
+@dirrm share/gnome/help/workspace-switcher/oc
 @dirrm share/gnome/help/workspace-switcher/nl
-@dirrm share/gnome/help/workspace-switcher/ko/figures
 @dirrm share/gnome/help/workspace-switcher/ko
 @dirrm share/gnome/help/workspace-switcher/ja/figures
 @dirrm share/gnome/help/workspace-switcher/ja
-@dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
 @dirrm share/gnome/help/workspace-switcher/fr
-@dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
+@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/C/figures
+@dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
 @dirrm share/gnome/help/window-list/zh_TW/figures
 @dirrm share/gnome/help/window-list/zh_TW
-@dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk/figures
 @dirrm share/gnome/help/window-list/uk
-@dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
-@dirrm share/gnome/help/window-list/ru/figures
 @dirrm share/gnome/help/window-list/ru
-@dirrm share/gnome/help/window-list/pa/figures
 @dirrm share/gnome/help/window-list/pa
-@dirrm share/gnome/help/window-list/ko/figures
+@dirrm share/gnome/help/window-list/oc
 @dirrm share/gnome/help/window-list/ko
 @dirrm share/gnome/help/window-list/ja/figures
 @dirrm share/gnome/help/window-list/ja
-@dirrm share/gnome/help/window-list/it/figures
 @dirrm share/gnome/help/window-list/it
-@dirrm share/gnome/help/window-list/fr/figures
 @dirrm share/gnome/help/window-list/fr
-@dirrm share/gnome/help/window-list/es/figures
 @dirrm share/gnome/help/window-list/es
+@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/C/figures
+@dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/fish/uk/figures
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/sv/figures
 @dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/oc/figures
+@dirrm share/gnome/help/fish/oc
+@dirrm share/gnome/help/fish/ko/figures
+@dirrm share/gnome/help/fish/ko
 @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/el/figures
+@dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/ca/figures
+@dirrm share/gnome/help/fish/ca
 @dirrm share/gnome/help/fish/C/figures
 @dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/fish-applet-2/zh_TW/figures
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/ko/figures
-@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/de/figures
@@ -527,6 +511,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/ru
 @dirrm share/gnome/help/clock/pa/figures
 @dirrm share/gnome/help/clock/pa
+@dirrm share/gnome/help/clock/oc/figures
+@dirrm share/gnome/help/clock/oc
 @dirrm share/gnome/help/clock/nl/figures
 @dirrm share/gnome/help/clock/nl
 @dirrm share/gnome/help/clock/ko/figures
@@ -539,11 +525,18 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/fr
 @dirrm share/gnome/help/clock/es/figures
 @dirrm share/gnome/help/clock/es
+@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/ca/figures
+@dirrm share/gnome/help/clock/ca
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm include/panel-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
@@ -553,10 +546,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -581,3 +578,4 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/applications