4 files changed, 155 insertions, 491 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 614fc9c762e6..b1f9e4228684 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.105 2007/03/12 12:00:20 ahze Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.112 2007/09/19 12:22:57 ahze Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +18,7 @@ COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -35,13 +34,10 @@ GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
 		gnome-cd.schemas gnome-sound-recorder.schemas \
 		gnome-volume-control.schemas
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
-.if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
-.endif
+	@${REINPLACE_CMD} -e 's|acd0c|acd0|g ; s|== "xyes|= "xyes|g' \
+		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index cd941224e7b6..750f2904ad5e 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.18.0.tar.bz2) = a472d8c7733b119376bc6127ee55a82d
-SHA256 (gnome2/gnome-media-2.18.0.tar.bz2) = 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
-SIZE (gnome2/gnome-media-2.18.0.tar.bz2) = 3007639
+MD5 (gnome2/gnome-media-2.20.1.tar.bz2) = 75036a6990725c4323812afd4cd734f5
+SHA256 (gnome2/gnome-media-2.20.1.tar.bz2) = 273b9eb4bc5a0cd7f1589f4eb242b995b05d64db20c05ec379d07af3b90d9c29
+SIZE (gnome2/gnome-media-2.20.1.tar.bz2) = 1927211
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
deleted file mode 100644
index c907f2fa56e7..000000000000
--- a/audio/gnome-media/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	Mon Feb 12 16:07:48 2007
-+++ configure	Mon Feb 12 16:08:23 2007
-@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
- else
-   enable_cddbslave=yes
- fi;
--if test "x$enable_cddbslave" == "xyes"; then
-+if test "x$enable_cddbslave" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
-@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
- else
-   enable_profiles=yes
- fi;
--if test "x$enable_profiles" == "xyes"; then
-+if test "x$enable_profiles" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for GMP" >&5
-@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
-   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
- fi
- 
--if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
-   PROGRAMS_GRECORD="grecord"
- 
-   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
-@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
- else
-   enable_vumeter=yes
- fi;
--if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
-+if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for VUMETER" >&5
-@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
- else
-   enable_gnomecd=yes
- fi;
--if test "x$enable_gnomecd" == "xyes"; then
-+if test "x$enable_gnomecd" = "xyes"; then
- 
- pkg_failed=no
- echo "$as_me:$LINENO: checking for GNOMECD" >&5
-@@ -24640,7 +24640,7 @@ fi
- 
- 
- 
--if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
-+if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
-   cdrom_header=""
- 
- for ac_header in linux/cdrom.h
-@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
- else
-   enable_gstprops=yes
- fi;
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
- then
-       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
- 
-@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
- else
-   enable_gstmix=yes
- fi;
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
- then
- 
- pkg_failed=no
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index f4f92bed5986..9429ae72b7ae 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -26,29 +26,27 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
 libdata/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
-share/gnome/applications/cddb-slave.desktop
-share/gnome/applications/gnome-cd.desktop
-share/gnome/applications/gnome-sound-recorder.desktop
-share/gnome/applications/gnome-volume-control.desktop
-share/gnome/applications/gstreamer-properties.desktop
-share/gnome/applications/reclevel.desktop
-share/gnome/applications/vumeter.desktop
-share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
-share/gnome/gnome-media/pixmaps/3dsound.png
-share/gnome/gnome-media/pixmaps/chain-broken.png
-share/gnome/gnome-media/pixmaps/chain.png
-share/gnome/gnome-media/pixmaps/headphones.png
-share/gnome/gnome-media/pixmaps/mixer.png
-share/gnome/gnome-media/pixmaps/noplay.png
-share/gnome/gnome-media/pixmaps/norecord.png
-share/gnome/gnome-media/pixmaps/phone.png
-share/gnome/gnome-media/pixmaps/play.png
-share/gnome/gnome-media/pixmaps/record.png
-share/gnome/gnome-media/pixmaps/tone.png
-share/gnome/gnome-media/pixmaps/video.png
-share/gnome/gnome-sound-recorder/ui/ui.xml
-share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
-share/gnome/gstreamer-properties/icons/gstreamer-properties.png
+share/applications/cddb-slave.desktop
+share/applications/gnome-cd.desktop
+share/applications/gnome-sound-recorder.desktop
+share/applications/gnome-volume-control.desktop
+share/applications/gstreamer-properties.desktop
+share/applications/reclevel.desktop
+share/applications/vumeter.desktop
+%%DATADIR%%/glade/gnome-audio-profiles.glade2
+%%DATADIR%%/pixmaps/3dsound.png
+%%DATADIR%%/pixmaps/chain-broken.png
+%%DATADIR%%/pixmaps/chain.png
+%%DATADIR%%/pixmaps/headphones.png
+%%DATADIR%%/pixmaps/mixer.png
+%%DATADIR%%/pixmaps/noplay.png
+%%DATADIR%%/pixmaps/norecord.png
+%%DATADIR%%/pixmaps/phone.png
+%%DATADIR%%/pixmaps/play.png
+%%DATADIR%%/pixmaps/record.png
+%%DATADIR%%/pixmaps/tone.png
+%%DATADIR%%/pixmaps/video.png
+share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -63,31 +61,11 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/de/figures/eject_button.png
-share/gnome/help/gnome-cd/de/figures/forward_button.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd.png
-share/gnome/help/gnome-cd/de/figures/next_button.png
-share/gnome/help/gnome-cd/de/figures/pause_button.png
-share/gnome/help/gnome-cd/de/figures/play_button.png
-share/gnome/help/gnome-cd/de/figures/preferences_button.png
-share/gnome/help/gnome-cd/de/figures/previous_button.png
-share/gnome/help/gnome-cd/de/figures/rewind_button.png
-share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.xml
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/es/figures/eject_button.png
 share/gnome/help/gnome-cd/es/figures/forward_button.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd.png
 share/gnome/help/gnome-cd/es/figures/next_button.png
 share/gnome/help/gnome-cd/es/figures/pause_button.png
 share/gnome/help/gnome-cd/es/figures/play_button.png
@@ -96,15 +74,11 @@ share/gnome/help/gnome-cd/es/figures/previous_button.png
 share/gnome/help/gnome-cd/es/figures/rewind_button.png
 share/gnome/help/gnome-cd/es/figures/stop_button.png
 share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/fr/figures/eject_button.png
 share/gnome/help/gnome-cd/fr/figures/forward_button.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd.png
 share/gnome/help/gnome-cd/fr/figures/next_button.png
 share/gnome/help/gnome-cd/fr/figures/pause_button.png
 share/gnome/help/gnome-cd/fr/figures/play_button.png
@@ -113,80 +87,11 @@ share/gnome/help/gnome-cd/fr/figures/previous_button.png
 share/gnome/help/gnome-cd/fr/figures/rewind_button.png
 share/gnome/help/gnome-cd/fr/figures/stop_button.png
 share/gnome/help/gnome-cd/fr/gnome-cd.xml
-share/gnome/help/gnome-cd/fr/legal.xml
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/it/figures/eject_button.png
-share/gnome/help/gnome-cd/it/figures/forward_button.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd.png
-share/gnome/help/gnome-cd/it/figures/next_button.png
-share/gnome/help/gnome-cd/it/figures/pause_button.png
-share/gnome/help/gnome-cd/it/figures/play_button.png
-share/gnome/help/gnome-cd/it/figures/preferences_button.png
-share/gnome/help/gnome-cd/it/figures/previous_button.png
-share/gnome/help/gnome-cd/it/figures/rewind_button.png
-share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/it/gnome-cd.xml
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/nl/figures/eject_button.png
-share/gnome/help/gnome-cd/nl/figures/forward_button.png
-share/gnome/help/gnome-cd/nl/figures/next_button.png
-share/gnome/help/gnome-cd/nl/figures/pause_button.png
-share/gnome/help/gnome-cd/nl/figures/play_button.png
-share/gnome/help/gnome-cd/nl/figures/preferences_button.png
-share/gnome/help/gnome-cd/nl/figures/previous_button.png
-share/gnome/help/gnome-cd/nl/figures/rewind_button.png
-share/gnome/help/gnome-cd/nl/figures/stop_button.png
-share/gnome/help/gnome-cd/nl/gnome-cd.xml
-share/gnome/help/gnome-cd/nl/legal.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/sv/figures/eject_button.png
 share/gnome/help/gnome-cd/sv/figures/forward_button.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
 share/gnome/help/gnome-cd/sv/figures/next_button.png
 share/gnome/help/gnome-cd/sv/figures/pause_button.png
 share/gnome/help/gnome-cd/sv/figures/play_button.png
@@ -195,251 +100,49 @@ share/gnome/help/gnome-cd/sv/figures/previous_button.png
 share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
 share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/uk/figures/eject_button.png
-share/gnome/help/gnome-cd/uk/figures/forward_button.png
-share/gnome/help/gnome-cd/uk/figures/next_button.png
-share/gnome/help/gnome-cd/uk/figures/pause_button.png
-share/gnome/help/gnome-cd/uk/figures/play_button.png
-share/gnome/help/gnome-cd/uk/figures/preferences_button.png
-share/gnome/help/gnome-cd/uk/figures/previous_button.png
-share/gnome/help/gnome-cd/uk/figures/rewind_button.png
-share/gnome/help/gnome-cd/uk/figures/stop_button.png
-share/gnome/help/gnome-cd/uk/gnome-cd.xml
-share/gnome/help/gnome-cd/uk/legal.xml
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_CN/figures/next_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/play_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_TW/figures/next_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/play_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_TW/legal.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/fr/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/oc/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/oc/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-share/gnome/help/gnome-sound-recorder/uk/legal.xml
-share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
-share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/uk/figures/gmix.png
-share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/uk/legal.xml
-share/gnome/help/grecord/de/figures/grecord-prefs-path.png
-share/gnome/help/grecord/de/figures/grecord-prefs-play.png
-share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/de/figures/grecord.png
-share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
-share/gnome/help/grecord/es/figures/grecord-prefs-path.png
-share/gnome/help/grecord/es/figures/grecord-prefs-play.png
-share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/es/figures/grecord.png
-share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
-share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/fr/figures/grecord.png
-share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
-share/gnome/help/grecord/it/figures/grecord-prefs-path.png
-share/gnome/help/grecord/it/figures/grecord-prefs-play.png
-share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/it/figures/grecord.png
-share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
-share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/sv/figures/grecord.png
-share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_CN/figures/grecord.png
-share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_TW/figures/grecord.png
-share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
-share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
-share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
-share/gnome/help/gstreamer-properties/uk/legal.xml
-share/gnome/idl/GNOME_Media_CDDBSlave2.idl
-share/gnome/omf/gnome-media/gnome-cd-C.omf
-share/gnome/omf/gnome-media/gnome-cd-de.omf
-share/gnome/omf/gnome-media/gnome-cd-es.omf
-share/gnome/omf/gnome-media/gnome-cd-fr.omf
-share/gnome/omf/gnome-media/gnome-cd-it.omf
-share/gnome/omf/gnome-media/gnome-cd-ja.omf
-share/gnome/omf/gnome-media/gnome-cd-ko.omf
-share/gnome/omf/gnome-media/gnome-cd-nl.omf
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-share/gnome/omf/gnome-media/gnome-cd-uk.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
-share/gnome/omf/gnome-media/gnome-volume-control-C.omf
-share/gnome/omf/gnome-media/gnome-volume-control-uk.omf
-share/gnome/omf/gnome-media/grecord-C.omf
-share/gnome/omf/gnome-media/grecord-de.omf
-share/gnome/omf/gnome-media/grecord-es.omf
-share/gnome/omf/gnome-media/grecord-fr.omf
-share/gnome/omf/gnome-media/grecord-it.omf
-share/gnome/omf/gnome-media/grecord-ja.omf
-share/gnome/omf/gnome-media/grecord-ko.omf
-share/gnome/omf/gnome-media/grecord-sv.omf
-share/gnome/omf/gnome-media/grecord-uk.omf
-share/gnome/omf/gnome-media/grecord-zh_CN.omf
-share/gnome/omf/gnome-media/grecord-zh_TW.omf
-share/gnome/omf/gnome-media/gstreamer-properties-C.omf
-share/gnome/omf/gnome-media/gstreamer-properties-uk.omf
-share/gnome/pixmaps/gnome-cd.png
-share/gnome/pixmaps/gnome-cd/cd.png
-share/gnome/pixmaps/gnome-cd/disc.png
-share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/once.png
-share/gnome/pixmaps/gnome-cd/repeat.png
-share/gnome/pixmaps/gnome-cd/themes/None/None.theme
-share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-next.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-play.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/top.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/lcd.theme
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/top.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/media/media.theme
-share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/middle.png
-share/gnome/pixmaps/gnome-cd/themes/media/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/media/top.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
-share/gnome/pixmaps/gnome-cd/track.png
-share/gnome/pixmaps/gnome-grecord.png
-share/gnome/pixmaps/gnome-mixer.png
-share/gnome/pixmaps/gnome-reclevel.png
-share/gnome/pixmaps/gnome-vumeter.png
-share/gnome/pixmaps/gstreamer-properties.png
+share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/fr/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
+share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gstreamer-properties/icons/gstreamer-properties.png
+share/icons/hicolor/48x48/apps/gnome-cd.png
+share/icons/hicolor/48x48/apps/gnome-grecord.png
+share/icons/hicolor/48x48/apps/gnome-reclevel.png
+share/icons/hicolor/48x48/apps/gnome-vumeter.png
+share/icons/hicolor/48x48/apps/gstreamer-properties.png
+share/idl/GNOME_Media_CDDBSlave2.idl
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
@@ -489,6 +192,7 @@ share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
@@ -497,6 +201,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
@@ -514,87 +219,121 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
-@dirrm share/gnome/pixmaps/gnome-cd/themes/media
-@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
-@dirrm share/gnome/pixmaps/gnome-cd/themes/None
-@dirrm share/gnome/pixmaps/gnome-cd/themes
-@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/omf/gnome-media
-@dirrm share/gnome/help/gstreamer-properties/uk/figures
-@dirrm share/gnome/help/gstreamer-properties/uk
+share/pixmaps/gnome-cd/disc.png
+share/pixmaps/gnome-cd/once.png
+share/pixmaps/gnome-cd/repeat.png
+share/pixmaps/gnome-cd/themes/None/None.theme
+share/pixmaps/gnome-cd/themes/None/bottom-left.png
+share/pixmaps/gnome-cd/themes/None/bottom-right.png
+share/pixmaps/gnome-cd/themes/None/bottom.png
+share/pixmaps/gnome-cd/themes/None/middle-left.png
+share/pixmaps/gnome-cd/themes/None/middle-right.png
+share/pixmaps/gnome-cd/themes/None/middle.png
+share/pixmaps/gnome-cd/themes/None/top-left.png
+share/pixmaps/gnome-cd/themes/None/top-right.png
+share/pixmaps/gnome-cd/themes/None/top.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/lcd/bottom.png
+share/pixmaps/gnome-cd/themes/lcd/lcd.theme
+share/pixmaps/gnome-cd/themes/lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/lcd/middle.png
+share/pixmaps/gnome-cd/themes/lcd/top-left.png
+share/pixmaps/gnome-cd/themes/lcd/top-right.png
+share/pixmaps/gnome-cd/themes/lcd/top.png
+share/pixmaps/gnome-cd/themes/media/bottom-left.png
+share/pixmaps/gnome-cd/themes/media/bottom-right.png
+share/pixmaps/gnome-cd/themes/media/bottom.png
+share/pixmaps/gnome-cd/themes/media/media.theme
+share/pixmaps/gnome-cd/themes/media/middle-left.png
+share/pixmaps/gnome-cd/themes/media/middle-right.png
+share/pixmaps/gnome-cd/themes/media/middle.png
+share/pixmaps/gnome-cd/themes/media/top-left.png
+share/pixmaps/gnome-cd/themes/media/top-right.png
+share/pixmaps/gnome-cd/themes/media/top.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle.png
+share/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
+share/pixmaps/gnome-cd/themes/red-lcd/top-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/top-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/top.png
+share/pixmaps/gnome-cd/track.png
+@dirrm share/pixmaps/gnome-cd/themes/red-lcd
+@dirrm share/pixmaps/gnome-cd/themes/media
+@dirrm share/pixmaps/gnome-cd/themes/lcd
+@dirrm share/pixmaps/gnome-cd/themes/None
+@dirrm share/pixmaps/gnome-cd/themes
+@dirrm share/pixmaps/gnome-cd
+@dirrm share/gstreamer-properties/icons
+@dirrm share/gstreamer-properties/glade
+@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/sv/figures
+@dirrm share/gnome/help/gstreamer-properties/sv
+@dirrm share/gnome/help/gstreamer-properties/oc/figures
+@dirrm share/gnome/help/gstreamer-properties/oc
+@dirrm share/gnome/help/gstreamer-properties/fr/figures
+@dirrm share/gnome/help/gstreamer-properties/fr
+@dirrm share/gnome/help/gstreamer-properties/es/figures
+@dirrm share/gnome/help/gstreamer-properties/es
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/grecord/zh_TW/figures
-@dirrm share/gnome/help/grecord/zh_TW
-@dirrm share/gnome/help/grecord/zh_CN/figures
-@dirrm share/gnome/help/grecord/zh_CN
-@dirrm share/gnome/help/grecord/sv/figures
-@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/grecord/ko/figures
-@dirrm share/gnome/help/grecord/ko
-@dirrm share/gnome/help/grecord/ja/figures
-@dirrm share/gnome/help/grecord/ja
-@dirrm share/gnome/help/grecord/it/figures
-@dirrm share/gnome/help/grecord/it
-@dirrm share/gnome/help/grecord/fr/figures
-@dirrm share/gnome/help/grecord/fr
-@dirrm share/gnome/help/grecord/es/figures
-@dirrm share/gnome/help/grecord/es
-@dirrm share/gnome/help/grecord/de/figures
-@dirrm share/gnome/help/grecord/de
-@dirrm share/gnome/help/grecord
-@dirrm share/gnome/help/gnome-volume-control/uk/figures
-@dirrm share/gnome/help/gnome-volume-control/uk
+@dirrm share/gnome/help/gnome-volume-control/sv/figures
+@dirrm share/gnome/help/gnome-volume-control/sv
+@dirrm share/gnome/help/gnome-volume-control/oc/figures
+@dirrm share/gnome/help/gnome-volume-control/oc
+@dirrm share/gnome/help/gnome-volume-control/fr/figures
+@dirrm share/gnome/help/gnome-volume-control/fr
+@dirrm share/gnome/help/gnome-volume-control/es/figures
+@dirrm share/gnome/help/gnome-volume-control/es
 @dirrm share/gnome/help/gnome-volume-control/C/figures
 @dirrm share/gnome/help/gnome-volume-control/C
 @dirrm share/gnome/help/gnome-volume-control
 @dirrm share/gnome/help/gnome-sound-recorder/uk/figures
 @dirrm share/gnome/help/gnome-sound-recorder/uk
+@dirrm share/gnome/help/gnome-sound-recorder/sv/figures
+@dirrm share/gnome/help/gnome-sound-recorder/sv
+@dirrm share/gnome/help/gnome-sound-recorder/oc/figures
+@dirrm share/gnome/help/gnome-sound-recorder/oc
+@dirrm share/gnome/help/gnome-sound-recorder/fr/figures
+@dirrm share/gnome/help/gnome-sound-recorder/fr
+@dirrm share/gnome/help/gnome-sound-recorder/es/figures
+@dirrm share/gnome/help/gnome-sound-recorder/es
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
-@dirrm share/gnome/help/gnome-cd/zh_TW/figures
-@dirrm share/gnome/help/gnome-cd/zh_TW
-@dirrm share/gnome/help/gnome-cd/zh_CN/figures
-@dirrm share/gnome/help/gnome-cd/zh_CN
-@dirrm share/gnome/help/gnome-cd/uk/figures
-@dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
-@dirrm share/gnome/help/gnome-cd/ko/figures
-@dirrm share/gnome/help/gnome-cd/ko
-@dirrm share/gnome/help/gnome-cd/ja/figures
-@dirrm share/gnome/help/gnome-cd/ja
-@dirrm share/gnome/help/gnome-cd/it/figures
-@dirrm share/gnome/help/gnome-cd/it
 @dirrm share/gnome/help/gnome-cd/fr/figures
 @dirrm share/gnome/help/gnome-cd/fr
 @dirrm share/gnome/help/gnome-cd/es/figures
 @dirrm share/gnome/help/gnome-cd/es
-@dirrm share/gnome/help/gnome-cd/de/figures
-@dirrm share/gnome/help/gnome-cd/de
 @dirrm share/gnome/help/gnome-cd/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/gstreamer-properties/icons
-@dirrm share/gnome/gstreamer-properties/glade
-@dirrm share/gnome/gstreamer-properties
-@dirrm share/gnome/gnome-sound-recorder/ui
-@dirrm share/gnome/gnome-sound-recorder
-@dirrm share/gnome/gnome-media/pixmaps
-@dirrm share/gnome/gnome-media/glade
-@dirrm share/gnome/gnome-media
+@dirrm share/gnome-sound-recorder/ui
+@dirrm share/gnome-sound-recorder
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
 @dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@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/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -603,3 +342,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications