Update to 2.2.2.

20 files changed, 830 insertions, 80 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f30007d9959c..63ade0c1b7d2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
@@ -15,7 +14,7 @@ DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional UI API for GNOME 2.0
+COMMENT=	Additional UI API for GNOME 2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,12 +27,13 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-about.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"| ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 9b5c1ebfe7b5..1ef3d1c22b0e 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.1.tar.bz2) = 95e6cf32afb647fdbb14d5c782b4ea9d
+MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
index 5b2ae3a8310b..943558a25604 100644
--- a/x11/gnome-desktop/files/patch-configure
+++ b/x11/gnome-desktop/files/patch-configure
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8175,7 +8176,7 @@
- GNOME_PLATFORM=2
- GNOME_MINOR=2
- GNOME_MICRO=1
--GNOME_VENDOR="Gnome.Org"
-+GNOME_VENDOR="FreeBSD GNOME Project"
- GNOME_DATE="Tuesday, March 11th 2003"
- 
- 
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index d778276271c5..2cd64cb14824 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -186,6 +186,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -198,9 +199,9 @@ share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -208,6 +209,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/lgpl/C/figures
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index c82692fceacc..eeab7d719f29 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.2
@@ -14,7 +14,7 @@ DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Panel component for the GNOME 2.0 Desktop
+COMMENT=	Panel component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
@@ -27,7 +27,7 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d336743cb7db..eb0c665360c7 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.2.1.tar.bz2) = 5d859216e411d5c557b241fbd71fe110
+MD5 (gnome2/gnome-panel-2.2.2.tar.bz2) = 76540d36d551069db6d5f90c810459fb
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 190577061c55..50f194abbf39 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -66,18 +66,6 @@ libdata/bonobo/servers/GNOME_Panel.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
 libexec/notification-area-applet
-share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
-share/gnome/gen_util/pager.glade
-share/gnome/gen_util/tasklist.glade
-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_MailCheckApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_PagerApplet.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_TasklistApplet.xml
-share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
 share/doc/panel-applet/applet-writing.html
@@ -89,26 +77,142 @@ share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/fish/fish.glade
+share/gnome/gen_util/pager.glade
+share/gnome/gen_util/tasklist.glade
+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_MailCheckApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_PagerApplet.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_TasklistApplet.xml
 share/gnome/gnome-panel/glade/panel-test-applets.glade
+share/gnome/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/de/clock.xml
+share/gnome/help/clock/de/figures/clock_applet.png
+share/gnome/help/clock/de/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/fr/clock.xml
+share/gnome/help/clock/fr/figures/clock_applet.png
+share/gnome/help/clock/fr/legal.xml
+share/gnome/help/clock/it/clock.xml
+share/gnome/help/clock/it/figures/clock_applet.png
+share/gnome/help/clock/it/legal.xml
 share/gnome/help/clock/ja/clock.xml
 share/gnome/help/clock/ja/figures/clock_applet.png
 share/gnome/help/clock/ja/legal.xml
+share/gnome/help/clock/ko/clock.xml
+share/gnome/help/clock/ko/figures/clock_applet.png
+share/gnome/help/clock/ko/legal.xml
+share/gnome/help/clock/sv/clock.xml
+share/gnome/help/clock/sv/figures/clock_applet.png
+share/gnome/help/clock/sv/legal.xml
+share/gnome/help/clock/zh_CN/clock.xml
+share/gnome/help/clock/zh_CN/figures/clock_applet.png
+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/C/figures/fish_applet.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/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/es/figures/fish_applet.png
+share/gnome/help/fish-applet-2/es/figures/fish_settings.png
+share/gnome/help/fish-applet-2/es/fish-applet-2.xml
+share/gnome/help/fish-applet-2/es/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/it/figures/fish_applet.png
+share/gnome/help/fish-applet-2/it/figures/fish_settings.png
+share/gnome/help/fish-applet-2/it/fish-applet-2.xml
+share/gnome/help/fish-applet-2/it/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/sv/figures/fish_applet.png
+share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
+share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
+share/gnome/help/fish-applet-2/sv/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
+share/gnome/help/fish-applet-2/zh_CN/legal.xml
+share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png
+share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png
+share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml
+share/gnome/help/fish-applet-2/zh_TW/legal.xml
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/mailcheck/de/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/de/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/de/legal.xml
+share/gnome/help/mailcheck/de/mailcheck.xml
+share/gnome/help/mailcheck/es/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/es/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/es/legal.xml
+share/gnome/help/mailcheck/es/mailcheck.xml
+share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/fr/legal.xml
+share/gnome/help/mailcheck/fr/mailcheck.xml
+share/gnome/help/mailcheck/it/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/it/legal.xml
+share/gnome/help/mailcheck/it/mailcheck.xml
 share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/ja/legal.xml
 share/gnome/help/mailcheck/ja/mailcheck.xml
+share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/ko/legal.xml
+share/gnome/help/mailcheck/ko/mailcheck.xml
+share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/sv/legal.xml
+share/gnome/help/mailcheck/sv/mailcheck.xml
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_CN/legal.xml
+share/gnome/help/mailcheck/zh_CN/mailcheck.xml
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_TW/legal.xml
+share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/notification-area/C/figures/notification-area.png
 share/gnome/help/notification-area/C/legal.xml
 share/gnome/help/notification-area/C/notification-area.xml
@@ -116,39 +220,191 @@ 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/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.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/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
+share/gnome/help/window-list/it/figures/window_list_applet.png
+share/gnome/help/window-list/it/figures/window_list_group.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/sv/figures/window_list_applet.png
+share/gnome/help/window-list/sv/figures/window_list_group.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/zh_CN/figures/window_list_applet.png
+share/gnome/help/window-list/zh_CN/figures/window_list_group.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/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/figures/workspacelist_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
+share/gnome/help/workspace-switcher/it/figures/workspacelist_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/sv/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
+share/gnome/help/workspace-switcher/sv/legal.xml
+share/gnome/help/workspace-switcher/sv/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
+share/gnome/help/workspace-switcher/zh_CN/workspace-switcher.xml
+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/gnome-panel/clock-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/clock-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/notification-area-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
@@ -156,18 +412,19 @@ share/gnome/pixmaps/fish/footguy.png
 share/gnome/pixmaps/fish/monkey.png
 share/gnome/pixmaps/fish/oldwanda.png
 share/gnome/pixmaps/gnome-fish.png
+share/gnome/pixmaps/gnome-show-desktop.png
 share/gnome/pixmaps/mailcheck/eclouds.png
 share/gnome/pixmaps/mailcheck/email-e.png
 share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
-share/gnome/pixmaps/gnome-show-desktop.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
@@ -184,6 +441,7 @@ share/locale/fr/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/he/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/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
@@ -192,6 +450,7 @@ share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
@@ -204,50 +463,131 @@ share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ru/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/sp/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/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/vi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/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/sv/figures
+@dirrm share/gnome/help/workspace-switcher/sv
+@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/de/figures
+@dirrm share/gnome/help/workspace-switcher/de
 @dirrm share/gnome/help/workspace-switcher/C/figures
 @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/sv/figures
+@dirrm share/gnome/help/window-list/sv
+@dirrm share/gnome/help/window-list/ko/figures
+@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/de/figures
+@dirrm share/gnome/help/window-list/de
 @dirrm share/gnome/help/window-list/C/figures
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/notification-area/C/figures
 @dirrm share/gnome/help/notification-area/C
 @dirrm share/gnome/help/notification-area
+@dirrm share/gnome/help/mailcheck/zh_TW/figures
+@dirrm share/gnome/help/mailcheck/zh_TW
+@dirrm share/gnome/help/mailcheck/zh_CN/figures
+@dirrm share/gnome/help/mailcheck/zh_CN
+@dirrm share/gnome/help/mailcheck/sv/figures
+@dirrm share/gnome/help/mailcheck/sv
+@dirrm share/gnome/help/mailcheck/ko/figures
+@dirrm share/gnome/help/mailcheck/ko
 @dirrm share/gnome/help/mailcheck/ja/figures
 @dirrm share/gnome/help/mailcheck/ja
+@dirrm share/gnome/help/mailcheck/it/figures
+@dirrm share/gnome/help/mailcheck/it
+@dirrm share/gnome/help/mailcheck/fr/figures
+@dirrm share/gnome/help/mailcheck/fr
+@dirrm share/gnome/help/mailcheck/es/figures
+@dirrm share/gnome/help/mailcheck/es
+@dirrm share/gnome/help/mailcheck/de/figures
+@dirrm share/gnome/help/mailcheck/de
 @dirrm share/gnome/help/mailcheck/C/figures
 @dirrm share/gnome/help/mailcheck/C
 @dirrm share/gnome/help/mailcheck
+@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/sv/figures
+@dirrm share/gnome/help/fish-applet-2/sv
+@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/it/figures
+@dirrm share/gnome/help/fish-applet-2/it
+@dirrm share/gnome/help/fish-applet-2/fr/figures
+@dirrm share/gnome/help/fish-applet-2/fr
+@dirrm share/gnome/help/fish-applet-2/es/figures
+@dirrm share/gnome/help/fish-applet-2/es
+@dirrm share/gnome/help/fish-applet-2/de/figures
+@dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2/C/figures
 @dirrm share/gnome/help/fish-applet-2/C
 @dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/clock/zh_TW/figures
+@dirrm share/gnome/help/clock/zh_TW
+@dirrm share/gnome/help/clock/zh_CN/figures
+@dirrm share/gnome/help/clock/zh_CN
+@dirrm share/gnome/help/clock/sv/figures
+@dirrm share/gnome/help/clock/sv
+@dirrm share/gnome/help/clock/ko/figures
+@dirrm share/gnome/help/clock/ko
 @dirrm share/gnome/help/clock/ja/figures
 @dirrm share/gnome/help/clock/ja
+@dirrm share/gnome/help/clock/it/figures
+@dirrm share/gnome/help/clock/it
+@dirrm share/gnome/help/clock/fr/figures
+@dirrm share/gnome/help/clock/fr
+@dirrm share/gnome/help/clock/es/figures
+@dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/de/figures
+@dirrm share/gnome/help/clock/de
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
-@dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
+@dirrm share/gnome/gen_util
 @dirrm share/gnome/fish
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
@@ -292,13 +632,53 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 79f92858a828..051b3ac8b369 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-session/2.2
@@ -14,7 +14,7 @@ DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Session component for the GNOME 2.0 desktop
+COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +23,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 95302d4e2b06..b1b7e4699ac1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.2.1.tar.bz2) = 53330d8b034d75c9e6d3e79e7314eb77
+MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index c88a201e4964..75f1650b4f35 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -18,6 +18,7 @@ share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
@@ -43,6 +44,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
@@ -55,9 +57,9 @@ share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index f30007d9959c..63ade0c1b7d2 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
@@ -15,7 +14,7 @@ DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional UI API for GNOME 2.0
+COMMENT=	Additional UI API for GNOME 2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,12 +27,13 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-about.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"| ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 9b5c1ebfe7b5..1ef3d1c22b0e 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.1.tar.bz2) = 95e6cf32afb647fdbb14d5c782b4ea9d
+MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900
diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure
index 5b2ae3a8310b..943558a25604 100644
--- a/x11/gnomedesktop/files/patch-configure
+++ b/x11/gnomedesktop/files/patch-configure
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8175,7 +8176,7 @@
- GNOME_PLATFORM=2
- GNOME_MINOR=2
- GNOME_MICRO=1
--GNOME_VENDOR="Gnome.Org"
-+GNOME_VENDOR="FreeBSD GNOME Project"
- GNOME_DATE="Tuesday, March 11th 2003"
- 
- 
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index d778276271c5..2cd64cb14824 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -186,6 +186,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -198,9 +199,9 @@ share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -208,6 +209,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/lgpl/C/figures
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index c82692fceacc..eeab7d719f29 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.2
@@ -14,7 +14,7 @@ DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Panel component for the GNOME 2.0 Desktop
+COMMENT=	Panel component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
@@ -27,7 +27,7 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index d336743cb7db..eb0c665360c7 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.2.1.tar.bz2) = 5d859216e411d5c557b241fbd71fe110
+MD5 (gnome2/gnome-panel-2.2.2.tar.bz2) = 76540d36d551069db6d5f90c810459fb
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 190577061c55..50f194abbf39 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -66,18 +66,6 @@ libdata/bonobo/servers/GNOME_Panel.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
 libexec/notification-area-applet
-share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
-share/gnome/gen_util/pager.glade
-share/gnome/gen_util/tasklist.glade
-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_MailCheckApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_PagerApplet.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_TasklistApplet.xml
-share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
 share/doc/panel-applet/applet-writing.html
@@ -89,26 +77,142 @@ share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/fish/fish.glade
+share/gnome/gen_util/pager.glade
+share/gnome/gen_util/tasklist.glade
+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_MailCheckApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_PagerApplet.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_TasklistApplet.xml
 share/gnome/gnome-panel/glade/panel-test-applets.glade
+share/gnome/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/de/clock.xml
+share/gnome/help/clock/de/figures/clock_applet.png
+share/gnome/help/clock/de/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/fr/clock.xml
+share/gnome/help/clock/fr/figures/clock_applet.png
+share/gnome/help/clock/fr/legal.xml
+share/gnome/help/clock/it/clock.xml
+share/gnome/help/clock/it/figures/clock_applet.png
+share/gnome/help/clock/it/legal.xml
 share/gnome/help/clock/ja/clock.xml
 share/gnome/help/clock/ja/figures/clock_applet.png
 share/gnome/help/clock/ja/legal.xml
+share/gnome/help/clock/ko/clock.xml
+share/gnome/help/clock/ko/figures/clock_applet.png
+share/gnome/help/clock/ko/legal.xml
+share/gnome/help/clock/sv/clock.xml
+share/gnome/help/clock/sv/figures/clock_applet.png
+share/gnome/help/clock/sv/legal.xml
+share/gnome/help/clock/zh_CN/clock.xml
+share/gnome/help/clock/zh_CN/figures/clock_applet.png
+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/C/figures/fish_applet.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/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/es/figures/fish_applet.png
+share/gnome/help/fish-applet-2/es/figures/fish_settings.png
+share/gnome/help/fish-applet-2/es/fish-applet-2.xml
+share/gnome/help/fish-applet-2/es/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/it/figures/fish_applet.png
+share/gnome/help/fish-applet-2/it/figures/fish_settings.png
+share/gnome/help/fish-applet-2/it/fish-applet-2.xml
+share/gnome/help/fish-applet-2/it/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/sv/figures/fish_applet.png
+share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
+share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
+share/gnome/help/fish-applet-2/sv/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
+share/gnome/help/fish-applet-2/zh_CN/legal.xml
+share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png
+share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png
+share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml
+share/gnome/help/fish-applet-2/zh_TW/legal.xml
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/mailcheck/de/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/de/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/de/legal.xml
+share/gnome/help/mailcheck/de/mailcheck.xml
+share/gnome/help/mailcheck/es/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/es/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/es/legal.xml
+share/gnome/help/mailcheck/es/mailcheck.xml
+share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/fr/legal.xml
+share/gnome/help/mailcheck/fr/mailcheck.xml
+share/gnome/help/mailcheck/it/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/it/legal.xml
+share/gnome/help/mailcheck/it/mailcheck.xml
 share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/ja/legal.xml
 share/gnome/help/mailcheck/ja/mailcheck.xml
+share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/ko/legal.xml
+share/gnome/help/mailcheck/ko/mailcheck.xml
+share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/sv/legal.xml
+share/gnome/help/mailcheck/sv/mailcheck.xml
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_CN/legal.xml
+share/gnome/help/mailcheck/zh_CN/mailcheck.xml
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
+share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
+share/gnome/help/mailcheck/zh_TW/legal.xml
+share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/notification-area/C/figures/notification-area.png
 share/gnome/help/notification-area/C/legal.xml
 share/gnome/help/notification-area/C/notification-area.xml
@@ -116,39 +220,191 @@ 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/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.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/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
+share/gnome/help/window-list/it/figures/window_list_applet.png
+share/gnome/help/window-list/it/figures/window_list_group.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/sv/figures/window_list_applet.png
+share/gnome/help/window-list/sv/figures/window_list_group.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/zh_CN/figures/window_list_applet.png
+share/gnome/help/window-list/zh_CN/figures/window_list_group.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/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/figures/workspacelist_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
+share/gnome/help/workspace-switcher/it/figures/workspacelist_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/sv/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
+share/gnome/help/workspace-switcher/sv/legal.xml
+share/gnome/help/workspace-switcher/sv/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
+share/gnome/help/workspace-switcher/zh_CN/workspace-switcher.xml
+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/gnome-panel/clock-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/clock-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/clock-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/notification-area-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/window-list-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-it.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
@@ -156,18 +412,19 @@ share/gnome/pixmaps/fish/footguy.png
 share/gnome/pixmaps/fish/monkey.png
 share/gnome/pixmaps/fish/oldwanda.png
 share/gnome/pixmaps/gnome-fish.png
+share/gnome/pixmaps/gnome-show-desktop.png
 share/gnome/pixmaps/mailcheck/eclouds.png
 share/gnome/pixmaps/mailcheck/email-e.png
 share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
-share/gnome/pixmaps/gnome-show-desktop.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
@@ -184,6 +441,7 @@ share/locale/fr/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/he/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/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
@@ -192,6 +450,7 @@ share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
@@ -204,50 +463,131 @@ share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ru/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/sp/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/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/vi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/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/sv/figures
+@dirrm share/gnome/help/workspace-switcher/sv
+@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/de/figures
+@dirrm share/gnome/help/workspace-switcher/de
 @dirrm share/gnome/help/workspace-switcher/C/figures
 @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/sv/figures
+@dirrm share/gnome/help/window-list/sv
+@dirrm share/gnome/help/window-list/ko/figures
+@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/de/figures
+@dirrm share/gnome/help/window-list/de
 @dirrm share/gnome/help/window-list/C/figures
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/notification-area/C/figures
 @dirrm share/gnome/help/notification-area/C
 @dirrm share/gnome/help/notification-area
+@dirrm share/gnome/help/mailcheck/zh_TW/figures
+@dirrm share/gnome/help/mailcheck/zh_TW
+@dirrm share/gnome/help/mailcheck/zh_CN/figures
+@dirrm share/gnome/help/mailcheck/zh_CN
+@dirrm share/gnome/help/mailcheck/sv/figures
+@dirrm share/gnome/help/mailcheck/sv
+@dirrm share/gnome/help/mailcheck/ko/figures
+@dirrm share/gnome/help/mailcheck/ko
 @dirrm share/gnome/help/mailcheck/ja/figures
 @dirrm share/gnome/help/mailcheck/ja
+@dirrm share/gnome/help/mailcheck/it/figures
+@dirrm share/gnome/help/mailcheck/it
+@dirrm share/gnome/help/mailcheck/fr/figures
+@dirrm share/gnome/help/mailcheck/fr
+@dirrm share/gnome/help/mailcheck/es/figures
+@dirrm share/gnome/help/mailcheck/es
+@dirrm share/gnome/help/mailcheck/de/figures
+@dirrm share/gnome/help/mailcheck/de
 @dirrm share/gnome/help/mailcheck/C/figures
 @dirrm share/gnome/help/mailcheck/C
 @dirrm share/gnome/help/mailcheck
+@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/sv/figures
+@dirrm share/gnome/help/fish-applet-2/sv
+@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/it/figures
+@dirrm share/gnome/help/fish-applet-2/it
+@dirrm share/gnome/help/fish-applet-2/fr/figures
+@dirrm share/gnome/help/fish-applet-2/fr
+@dirrm share/gnome/help/fish-applet-2/es/figures
+@dirrm share/gnome/help/fish-applet-2/es
+@dirrm share/gnome/help/fish-applet-2/de/figures
+@dirrm share/gnome/help/fish-applet-2/de
 @dirrm share/gnome/help/fish-applet-2/C/figures
 @dirrm share/gnome/help/fish-applet-2/C
 @dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/clock/zh_TW/figures
+@dirrm share/gnome/help/clock/zh_TW
+@dirrm share/gnome/help/clock/zh_CN/figures
+@dirrm share/gnome/help/clock/zh_CN
+@dirrm share/gnome/help/clock/sv/figures
+@dirrm share/gnome/help/clock/sv
+@dirrm share/gnome/help/clock/ko/figures
+@dirrm share/gnome/help/clock/ko
 @dirrm share/gnome/help/clock/ja/figures
 @dirrm share/gnome/help/clock/ja
+@dirrm share/gnome/help/clock/it/figures
+@dirrm share/gnome/help/clock/it
+@dirrm share/gnome/help/clock/fr/figures
+@dirrm share/gnome/help/clock/fr
+@dirrm share/gnome/help/clock/es/figures
+@dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/de/figures
+@dirrm share/gnome/help/clock/de
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
-@dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
+@dirrm share/gnome/gen_util
 @dirrm share/gnome/fish
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
@@ -292,13 +632,53 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 79f92858a828..051b3ac8b369 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-session/2.2
@@ -14,7 +14,7 @@ DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Session component for the GNOME 2.0 desktop
+COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +23,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 95302d4e2b06..b1b7e4699ac1 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.2.1.tar.bz2) = 53330d8b034d75c9e6d3e79e7314eb77
+MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index c88a201e4964..75f1650b4f35 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -18,6 +18,7 @@ share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
@@ -43,6 +44,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
@@ -55,9 +57,9 @@ share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo