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, 266 insertions, 226 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 636231b55fb9..66fbc75c298d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,16 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.132 2007/03/12 22:05:56 marcus Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	control-center-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -34,8 +32,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-gstreamer=0.10
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
@@ -61,11 +59,8 @@ PLIST_SUB+=	ABOUTME="@comment "
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
-	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
-		s|/bin/gzip|/usr/bin/gzip|g' \
-		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    	${WRKSRC}/capplets/common/gnome-theme-info.c
 
 post-install:
 	@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 93f3920035fa..8d9a2d632d89 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.18.1.tar.bz2) = bae0fd0f9e32f374bd7236d98788b13f
-SHA256 (gnome2/control-center-2.18.1.tar.bz2) = 3bb1474a6914d5a210a6f21368c48c9c302918a4ab94a5282b84b57ebc432c87
-SIZE (gnome2/control-center-2.18.1.tar.bz2) = 2150134
+MD5 (gnome2/gnome-control-center-2.20.1.tar.bz2) = d7420f0fc28937573a13bc5c1633b23b
+SHA256 (gnome2/gnome-control-center-2.20.1.tar.bz2) = 631d7621584a27a0edc43f05c6e2b45d6c44c1bc570abaa155472ca9b321d4d0
+SIZE (gnome2/gnome-control-center-2.20.1.tar.bz2) = 2292719
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
new file mode 100644
index 000000000000..5f5eb4bc15a5
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -0,0 +1,20 @@
+--- capplets/common/gnome-theme-info.c.orig	2007-08-27 04:09:06.000000000 -0400
++++ capplets/common/gnome-theme-info.c	2007-09-20 15:24:56.000000000 -0400
+@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
+     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
+     g_free (filename);
+ 
+-    theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
++    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
+     theme_info->path = g_strdup (theme_info->name);
+ 
+     if (!strcmp (theme_info->path, cursor_font))
+@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+   gnome_vfs_uri_unref (top_theme_dir_uri);
+ 
+   /* The weird /usr/share/icons */
+-  top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
++  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
+   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
+     gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
+   result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
deleted file mode 100644
index 95bbf2ea4dab..000000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_gnome-wm-manager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/gnome-wm-manager.c.orig	Mon Nov 11 00:42:08 2002
-+++ libwindow-settings/gnome-wm-manager.c	Mon Nov 11 00:43:26 2002
-@@ -227,7 +227,7 @@
- 
-         done_scan = TRUE;
-         
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         scan_wm_directory (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 45b72866f165..6832272beb97 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,22 +1,21 @@
 %%ABOUTME%%bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
+bin/gnome-appearance-properties
+bin/gnome-at-mobility
 bin/gnome-at-properties
-bin/gnome-background-properties
+bin/gnome-at-visual
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
-bin/gnome-ui-properties
 bin/gnome-window-properties
 bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
@@ -44,95 +43,95 @@ lib/nautilus/extensions-1.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
+libdata/pkgconfig/gnome-keybindings.pc
 libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
+share/applications/accessibility-keyboard.desktop
+share/applications/at-properties.desktop
+share/applications/default-applications.desktop
+share/applications/display-properties.desktop
+%%ABOUTME%%share/applications/gnome-about-me.desktop
+share/applications/gnome-appearance-properties.desktop
+share/applications/gnome-font-viewer.desktop
+share/applications/gnome-network-preferences.desktop
+share/applications/gnome-settings-mouse.desktop
+share/applications/gnome-settings-sound.desktop
+share/applications/gnome-theme-installer.desktop
+share/applications/gnomecc.desktop
+share/applications/keybinding.desktop
+share/applications/keyboard.desktop
+share/applications/themus-theme-applier.desktop
+share/applications/window-properties.desktop
 share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/gnome/applications/accessibility-keyboard.desktop
-share/gnome/applications/at-properties.desktop
-share/gnome/applications/background.desktop
-share/gnome/applications/default-applications.desktop
-share/gnome/applications/display-properties.desktop
-share/gnome/applications/font-properties.desktop
-%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
-share/gnome/applications/gnome-font-viewer.desktop
-share/gnome/applications/gnome-network-preferences.desktop
-share/gnome/applications/gnome-settings-mouse.desktop
-share/gnome/applications/gnome-settings-sound.desktop
-share/gnome/applications/gnome-theme-installer.desktop
-share/gnome/applications/gnome-ui-properties.desktop
-share/gnome/applications/gnomecc.desktop
-share/gnome/applications/gtk-theme-selector.desktop
-share/gnome/applications/keybinding.desktop
-share/gnome/applications/keyboard.desktop
-share/gnome/applications/themus-theme-applier.desktop
-share/gnome/applications/window-properties.desktop
-share/gnome/control-center/glade/acme.glade
-share/gnome/control-center/glade/apply-font.glade
-share/gnome/control-center/glade/at-enable-dialog.glade
-share/gnome/control-center/glade/font-properties.glade
-%%ABOUTME%%share/gnome/control-center/glade/gnome-about-me.glade
-share/gnome/control-center/glade/gnome-accessibility-keyboard-properties.glade
-share/gnome/control-center/glade/gnome-background-properties.glade
-share/gnome/control-center/glade/gnome-default-applications-properties.glade
-share/gnome/control-center/glade/gnome-keybinding-properties.glade
-share/gnome/control-center/glade/gnome-keyboard-properties.glade
-share/gnome/control-center/glade/gnome-mouse-properties.glade
-share/gnome/control-center/glade/gnome-network-preferences.glade
-share/gnome/control-center/glade/gnome-ui-properties.glade
-share/gnome/control-center/glade/gnome-window-properties.glade
-share/gnome/control-center/glade/modmap-dialog.glade
-share/gnome/control-center/glade/sound-properties.glade
-share/gnome/control-center/glade/theme-properties.glade
-share/gnome/control-center/gnome-default-applications.xml
-share/gnome/control-center/icons/display-capplet.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome/control-center/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center/pixmaps/acme-eject.png
-share/gnome/control-center/pixmaps/at-startup.png
-share/gnome/control-center/pixmaps/at-support.png
-share/gnome/control-center/pixmaps/bar-disabled.png
-share/gnome/control-center/pixmaps/bar-green.png
-share/gnome/control-center/pixmaps/bar-red.png
-share/gnome/control-center/pixmaps/bar.png
-share/gnome/control-center/pixmaps/double-click-maybe.png
-share/gnome/control-center/pixmaps/double-click-off.png
-share/gnome/control-center/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock.png
-share/gnome/control-center/pixmaps/keyboard-bell.png
-share/gnome/control-center/pixmaps/keyboard-cursor.png
-share/gnome/control-center/pixmaps/keyboard-repeat.png
-share/gnome/control-center/pixmaps/keyboard-volume.png
-share/gnome/control-center/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center/pixmaps/mouse-cursor-white-large.png
-share/gnome/control-center/pixmaps/mouse-cursor-white.png
-share/gnome/control-center/pixmaps/mouse-left.png
-share/gnome/control-center/pixmaps/mouse-right.png
-share/gnome/control-center/pixmaps/ocean-stripes.png
-share/gnome/control-center/pixmaps/stop.png
-share/gnome/control-center/pixmaps/subpixel-bgr.png
-share/gnome/control-center/pixmaps/subpixel-rgb.png
-share/gnome/control-center/pixmaps/subpixel-vbgr.png
-share/gnome/control-center/pixmaps/subpixel-vrgb.png
-share/gnome/control-center/pixmaps/theme-thumbnailing.png
-share/gnome/control-center/pixmaps/visual-bell.png
-share/gnome/control-center/xrdb/Editres.ad
-share/gnome/control-center/xrdb/Emacs.ad
-share/gnome/control-center/xrdb/General.ad
-share/gnome/control-center/xrdb/Motif.ad
-share/gnome/control-center/xrdb/Tk.ad
-share/gnome/control-center/xrdb/Xaw.ad
+share/desktop-directories/font-method.directory
+share/desktop-directories/gnomecc.directory
+share/desktop-directories/theme-method.directory
+%%DATADIR%%/glade/acme.glade
+%%DATADIR%%/glade/appearance.glade
+%%DATADIR%%/glade/apply-font.glade
+%%DATADIR%%/glade/at-enable-dialog.glade
+%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
+%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade
+%%DATADIR%%/glade/gnome-default-applications-properties.glade
+%%DATADIR%%/glade/gnome-keybinding-properties.glade
+%%DATADIR%%/glade/gnome-keyboard-properties.glade
+%%DATADIR%%/glade/gnome-mouse-properties.glade
+%%DATADIR%%/glade/gnome-network-preferences.glade
+%%DATADIR%%/glade/gnome-window-properties.glade
+%%DATADIR%%/glade/modmap-dialog.glade
+%%DATADIR%%/glade/sound-properties.glade
+%%DATADIR%%/gnome-default-applications.xml
+%%DATADIR%%/keybindings/00-multimedia-key.xml
+%%DATADIR%%/keybindings/01-desktop-key.xml
+%%DATADIR%%/pixmaps/accessibility-keyboard-bouncekey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png
+%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png
+%%DATADIR%%/pixmaps/acme-eject.png
+%%DATADIR%%/pixmaps/at-startup.png
+%%DATADIR%%/pixmaps/at-support.png
+%%DATADIR%%/pixmaps/bar-disabled.png
+%%DATADIR%%/pixmaps/bar-green.png
+%%DATADIR%%/pixmaps/bar-red.png
+%%DATADIR%%/pixmaps/bar.png
+%%DATADIR%%/pixmaps/double-click-maybe.png
+%%DATADIR%%/pixmaps/double-click-off.png
+%%DATADIR%%/pixmaps/double-click-on.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
+%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/keyboard-bell.png
+%%DATADIR%%/pixmaps/keyboard-cursor.png
+%%DATADIR%%/pixmaps/keyboard-repeat.png
+%%DATADIR%%/pixmaps/keyboard-volume.png
+%%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-normal.png
+%%DATADIR%%/pixmaps/mouse-cursor-white-large.png
+%%DATADIR%%/pixmaps/mouse-cursor-white.png
+%%DATADIR%%/pixmaps/mouse-left.png
+%%DATADIR%%/pixmaps/mouse-right.png
+%%DATADIR%%/pixmaps/ocean-stripes.png
+%%DATADIR%%/pixmaps/stop.png
+%%DATADIR%%/pixmaps/subpixel-bgr.png
+%%DATADIR%%/pixmaps/subpixel-rgb.png
+%%DATADIR%%/pixmaps/subpixel-vbgr.png
+%%DATADIR%%/pixmaps/subpixel-vrgb.png
+%%DATADIR%%/pixmaps/theme-thumbnailing.png
+%%DATADIR%%/pixmaps/visual-bell.png
+%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
+%%DATADIR%%/xrdb/Editres.ad
+%%DATADIR%%/xrdb/Emacs.ad
+%%DATADIR%%/xrdb/General.ad
+%%DATADIR%%/xrdb/Motif.ad
+%%DATADIR%%/xrdb/Tk.ad
+%%DATADIR%%/xrdb/Xaw.ad
+share/gnome/autostart/gnome-at-session.desktop
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
-share/gnome/desktop-directories/font-method.directory
-share/gnome/desktop-directories/gnomecc.directory
-share/gnome/desktop-directories/theme-method.directory
 share/gnome/help/control-center/C/config-accessibility-keyboard.xml
 share/gnome/help/control-center/C/config-background.xml
 share/gnome/help/control-center/C/config-behavior.xml
@@ -148,106 +147,162 @@ share/gnome/help/control-center/C/config-screensaver.xml
 share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/ja/control-center.xml
+share/gnome/help/control-center/oc/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
 share/gnome/help/control-center/uk/control-center.xml
+share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
-share/gnome/omf/control-center/control-center-C.omf
-share/gnome/omf/control-center/control-center-en_GB.omf
-share/gnome/omf/control-center/control-center-es.omf
-share/gnome/omf/control-center/control-center-fr.omf
-share/gnome/omf/control-center/control-center-pa.omf
-share/gnome/omf/control-center/control-center-ru.omf
-share/gnome/omf/control-center/control-center-sv.omf
-share/gnome/omf/control-center/control-center-uk.omf
-share/gnome/omf/control-center/control-center-zh_CN.omf
-share/gnome/pixmaps/display-capplet.png
+share/icons/hicolor/16x16/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/gnome-network-preferences.png
+share/icons/hicolor/16x16/apps/gnome-sound-properties.png
+share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/gnome-network-preferences.png
+share/icons/hicolor/22x22/apps/gnome-sound-properties.png
+share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/gnome-network-preferences.png
+share/icons/hicolor/24x24/apps/gnome-sound-properties.png
+share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/32x32/apps/gnome-network-preferences.png
+share/icons/hicolor/32x32/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/gnome-display-properties.svg
+share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
+share/icons/hicolor/scalable/apps/gnome-sound-properties.svg
 share/icons/hicolor/scalable/apps/typing-monitor.svg
-share/locale/af/LC_MESSAGES/control-center-2.0.mo
-share/locale/am/LC_MESSAGES/control-center-2.0.mo
-share/locale/ar/LC_MESSAGES/control-center-2.0.mo
-share/locale/az/LC_MESSAGES/control-center-2.0.mo
-share/locale/be/LC_MESSAGES/control-center-2.0.mo
-share/locale/bg/LC_MESSAGES/control-center-2.0.mo
-share/locale/bn/LC_MESSAGES/control-center-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/control-center-2.0.mo
-share/locale/br/LC_MESSAGES/control-center-2.0.mo
-share/locale/bs/LC_MESSAGES/control-center-2.0.mo
-share/locale/ca/LC_MESSAGES/control-center-2.0.mo
-share/locale/cs/LC_MESSAGES/control-center-2.0.mo
-share/locale/cy/LC_MESSAGES/control-center-2.0.mo
-share/locale/da/LC_MESSAGES/control-center-2.0.mo
-share/locale/de/LC_MESSAGES/control-center-2.0.mo
-share/locale/dz/LC_MESSAGES/control-center-2.0.mo
-share/locale/el/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
-share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
-share/locale/es/LC_MESSAGES/control-center-2.0.mo
-share/locale/et/LC_MESSAGES/control-center-2.0.mo
-share/locale/eu/LC_MESSAGES/control-center-2.0.mo
-share/locale/fa/LC_MESSAGES/control-center-2.0.mo
-share/locale/fi/LC_MESSAGES/control-center-2.0.mo
-share/locale/fr/LC_MESSAGES/control-center-2.0.mo
-share/locale/ga/LC_MESSAGES/control-center-2.0.mo
-share/locale/gl/LC_MESSAGES/control-center-2.0.mo
-share/locale/gu/LC_MESSAGES/control-center-2.0.mo
-share/locale/he/LC_MESSAGES/control-center-2.0.mo
-share/locale/hi/LC_MESSAGES/control-center-2.0.mo
-share/locale/hr/LC_MESSAGES/control-center-2.0.mo
-share/locale/hu/LC_MESSAGES/control-center-2.0.mo
-share/locale/id/LC_MESSAGES/control-center-2.0.mo
-share/locale/is/LC_MESSAGES/control-center-2.0.mo
-share/locale/it/LC_MESSAGES/control-center-2.0.mo
-share/locale/ja/LC_MESSAGES/control-center-2.0.mo
-share/locale/ka/LC_MESSAGES/control-center-2.0.mo
-share/locale/ko/LC_MESSAGES/control-center-2.0.mo
-share/locale/ku/LC_MESSAGES/control-center-2.0.mo
-share/locale/lt/LC_MESSAGES/control-center-2.0.mo
-share/locale/lv/LC_MESSAGES/control-center-2.0.mo
-share/locale/mg/LC_MESSAGES/control-center-2.0.mo
-share/locale/mk/LC_MESSAGES/control-center-2.0.mo
-share/locale/ml/LC_MESSAGES/control-center-2.0.mo
-share/locale/mn/LC_MESSAGES/control-center-2.0.mo
-share/locale/mr/LC_MESSAGES/control-center-2.0.mo
-share/locale/ms/LC_MESSAGES/control-center-2.0.mo
-share/locale/nb/LC_MESSAGES/control-center-2.0.mo
-share/locale/ne/LC_MESSAGES/control-center-2.0.mo
-share/locale/nl/LC_MESSAGES/control-center-2.0.mo
-share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/nso/LC_MESSAGES/control-center-2.0.mo
-share/locale/or/LC_MESSAGES/control-center-2.0.mo
-share/locale/pa/LC_MESSAGES/control-center-2.0.mo
-share/locale/pl/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt/LC_MESSAGES/control-center-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
-share/locale/ro/LC_MESSAGES/control-center-2.0.mo
-share/locale/ru/LC_MESSAGES/control-center-2.0.mo
-share/locale/rw/LC_MESSAGES/control-center-2.0.mo
-share/locale/sk/LC_MESSAGES/control-center-2.0.mo
-share/locale/sl/LC_MESSAGES/control-center-2.0.mo
-share/locale/sq/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr/LC_MESSAGES/control-center-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
-share/locale/sv/LC_MESSAGES/control-center-2.0.mo
-share/locale/ta/LC_MESSAGES/control-center-2.0.mo
-share/locale/te/LC_MESSAGES/control-center-2.0.mo
-share/locale/th/LC_MESSAGES/control-center-2.0.mo
-share/locale/tr/LC_MESSAGES/control-center-2.0.mo
-share/locale/uk/LC_MESSAGES/control-center-2.0.mo
-share/locale/vi/LC_MESSAGES/control-center-2.0.mo
-share/locale/wa/LC_MESSAGES/control-center-2.0.mo
-share/locale/xh/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
-share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ml/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
 share/mime/application/x-gnome-theme-package.xml
 share/mime/packages/gnome-theme-package.xml
+share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-ca.omf
+share/omf/control-center/control-center-en_GB.omf
+share/omf/control-center/control-center-es.omf
+share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-ja.omf
+share/omf/control-center/control-center-oc.omf
+share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pt_BR.omf
+share/omf/control-center/control-center-ru.omf
+share/omf/control-center/control-center-sv.omf
+share/omf/control-center/control-center-uk.omf
+share/omf/control-center/control-center-vi.omf
+share/omf/control-center/control-center-zh_CN.omf
+@dirrm share/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/vi
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pt_BR
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/oc
+@dirrm share/gnome/help/control-center/ja
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/ca
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/cursor-fonts
+@dirrm %%DATADIR%%/xrdb
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrmtry share/desktop-directories
+@dirrm lib/window-manager-settings
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -256,8 +311,12 @@ share/mime/packages/gnome-theme-package.xml
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@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
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -270,29 +329,6 @@ share/mime/packages/gnome-theme-package.xml
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/uk
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/pa
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/en_GB
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
-@dirrm share/gnome/desktop-directories
-@dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/control-center/xrdb
-@dirrm share/gnome/control-center/pixmaps
-@dirrmtry share/gnome/control-center/icons
-@dirrm share/gnome/control-center/glade
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications