6 files changed, 44 insertions, 287 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 2a6766433455..74e21e8ff561 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.114 2008/03/11 02:39:19 mezz Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.123 2008/09/24 03:17:39 mezz Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.22.0
-PORTREVISION=	1
+PORTVERSION=	2.24.0.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,15 +23,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		gail nautiluscdburner
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop nautiluscdburner
 USE_GSTREAMER=	cdparanoia esound gconf good
 CONFIGURE_ARGS=	--enable-ipv6
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
-		gnome-cd.schemas gnome-sound-recorder.schemas \
+GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
+		gnome-sound-recorder.schemas \
 		gnome-volume-control.schemas
 
 post-patch:
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 6f477f10616b..14cdbe58006a 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.22.0.tar.bz2) = e3fabb87abd2731d7f345d724b40333a
-SHA256 (gnome2/gnome-media-2.22.0.tar.bz2) = 9bafcc1d766ea3b0c30d79c33eb77ad8ceaad8631337f66f7797524e90281b4a
-SIZE (gnome2/gnome-media-2.22.0.tar.bz2) = 2237463
+MD5 (gnome2/gnome-media-2.24.0.1.tar.bz2) = d0a9b0784872cecd09038aceea22e16f
+SHA256 (gnome2/gnome-media-2.24.0.1.tar.bz2) = bfa79a9bea5ba6f73a6b0a232917bc7eefbed69819e42d0b09372b0c7ed3e853
+SIZE (gnome2/gnome-media-2.24.0.1.tar.bz2) = 2344888
diff --git a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h
deleted file mode 100644
index 1ec1fc50f5d5..000000000000
--- a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cddb-slave2/gnet-private.h.orig	Tue Aug 31 19:58:18 2004
-+++ cddb-slave2/gnet-private.h	Tue Aug 31 20:02:23 2004
-@@ -68,7 +68,7 @@
- #include <resolv.h>
- #include <netdb.h>
- 
--#ifndef __socklen_t_defined
-+#if !defined(__socklen_t_defined) && !defined(__FreeBSD__)
- typedef guint32 socklen_t;
- #endif
- 
diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
deleted file mode 100644
index f316b7f01301..000000000000
--- a/audio/gnome-media/files/patch-cddb-slave2_tcp.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
-+++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
-@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
- 		continue;
- 
- 	      sa_in6->sin6_scope_id = ifindex;
--	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
-+	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
- 	      if (con == 0 || errno == EINPROGRESS)
- 				break;
- 
-@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
-       memcpy(&sa, &addr->sa, sizeof(sa));
-       sa_in = (struct sockaddr_in *) &sa;
-       sa_in->sin_family = AF_INET;
--      con = connect(s->sockfd, &sa, sizeof(s->sa));
-+      con = connect(s->sockfd, &sa, sizeof(sa));
-     }
- 
-   /* Connect (but non-blocking!) */
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
deleted file mode 100644
index dee1aa98903d..000000000000
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-cd/gst-cdrom.c.orig	Mon Jan 22 09:01:38 2007
-+++ gnome-cd/gst-cdrom.c	Mon Feb 12 15:59:18 2007
-@@ -44,13 +44,17 @@
- #endif
- 
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCCAPABILITY
-+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCGETVOL
-+struct ioc_vol vol_value;
-+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR &vol_value
- # define GST_CDROM_IOCTL_EJECT_REQUEST         CDIOCEJECT
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCGETVOL
-+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
- # define GST_CDROM_IOCTL_EJECT_REQUEST         CDIOCEJECT
- #else
- # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDROM_GET_CAPABILITY
-+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
- # define GST_CDROM_IOCTL_EJECT_REQUEST         CDROMEJECT
- #endif
- 
-@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * 
- #ifdef __sun
-       res = TRUE;
- #else
--      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) {
-+      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) {
-         res = TRUE;
-       } else {
-         GST_DEBUG ("ioctl() failed: %s", g_strerror (errno));
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 1174977da17d..9f18eb4a6317 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,20 +1,12 @@
-bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
-bin/gnome-cd
 bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
-bin/vumeter
-include/cddb-slave2/cddb-slave-client.h
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
 include/gnome-media/profiles/audio-profiles-edit.h
 include/gnome-media/profiles/gnome-media-profiles.h
-lib/libcddb-slave2.a
-lib/libcddb-slave2.la
-lib/libcddb-slave2.so
-lib/libcddb-slave2.so.0
 lib/libglade/2.0/libgnome-media-profiles.a
 lib/libglade/2.0/libgnome-media-profiles.la
 lib/libglade/2.0/libgnome-media-profiles.so
@@ -22,141 +14,21 @@ lib/libgnome-media-profiles.a
 lib/libgnome-media-profiles.la
 lib/libgnome-media-profiles.so
 lib/libgnome-media-profiles.so.0
-libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
 libdata/pkgconfig/gnome-media-profiles.pc
-libexec/CDDBSlave2
-libexec/cddb-track-editor
-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
-share/gnome/help/gnome-cd/C/figures/eject_button.png
-share/gnome/help/gnome-cd/C/figures/forward_button.png
-share/gnome/help/gnome-cd/C/figures/next_button.png
-share/gnome/help/gnome-cd/C/figures/pause_button.png
-share/gnome/help/gnome-cd/C/figures/play_button.png
-share/gnome/help/gnome-cd/C/figures/preferences_button.png
-share/gnome/help/gnome-cd/C/figures/previous_button.png
-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/ca/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ca/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ca/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ca/figures/eject_button.png
-share/gnome/help/gnome-cd/ca/figures/forward_button.png
-share/gnome/help/gnome-cd/ca/figures/next_button.png
-share/gnome/help/gnome-cd/ca/figures/pause_button.png
-share/gnome/help/gnome-cd/ca/figures/play_button.png
-share/gnome/help/gnome-cd/ca/figures/preferences_button.png
-share/gnome/help/gnome-cd/ca/figures/previous_button.png
-share/gnome/help/gnome-cd/ca/figures/rewind_button.png
-share/gnome/help/gnome-cd/ca/figures/stop_button.png
-share/gnome/help/gnome-cd/ca/gnome-cd.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/next_button.png
-share/gnome/help/gnome-cd/es/figures/pause_button.png
-share/gnome/help/gnome-cd/es/figures/play_button.png
-share/gnome/help/gnome-cd/es/figures/preferences_button.png
-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/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/next_button.png
-share/gnome/help/gnome-cd/fr/figures/pause_button.png
-share/gnome/help/gnome-cd/fr/figures/play_button.png
-share/gnome/help/gnome-cd/fr/figures/preferences_button.png
-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/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/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/oc/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/oc/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/oc/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/oc/figures/eject_button.png
-share/gnome/help/gnome-cd/oc/figures/forward_button.png
-share/gnome/help/gnome-cd/oc/figures/next_button.png
-share/gnome/help/gnome-cd/oc/figures/pause_button.png
-share/gnome/help/gnome-cd/oc/figures/play_button.png
-share/gnome/help/gnome-cd/oc/figures/preferences_button.png
-share/gnome/help/gnome-cd/oc/figures/previous_button.png
-share/gnome/help/gnome-cd/oc/figures/rewind_button.png
-share/gnome/help/gnome-cd/oc/figures/stop_button.png
-share/gnome/help/gnome-cd/oc/gnome-cd.xml
-share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ru/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ru/figures/eject_button.png
-share/gnome/help/gnome-cd/ru/figures/forward_button.png
-share/gnome/help/gnome-cd/ru/figures/next_button.png
-share/gnome/help/gnome-cd/ru/figures/pause_button.png
-share/gnome/help/gnome-cd/ru/figures/play_button.png
-share/gnome/help/gnome-cd/ru/figures/preferences_button.png
-share/gnome/help/gnome-cd/ru/figures/previous_button.png
-share/gnome/help/gnome-cd/ru/figures/rewind_button.png
-share/gnome/help/gnome-cd/ru/figures/stop_button.png
-share/gnome/help/gnome-cd/ru/gnome-cd.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/next_button.png
-share/gnome/help/gnome-cd/sv/figures/pause_button.png
-share/gnome/help/gnome-cd/sv/figures/play_button.png
-share/gnome/help/gnome-cd/sv/figures/preferences_button.png
-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-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/ca/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.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
@@ -176,6 +48,8 @@ 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/ca/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/de/gnome-volume-control.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
@@ -193,6 +67,8 @@ share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
 share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml
 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
@@ -207,12 +83,18 @@ 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/16x16/apps/gnome-sound-recorder.png
+share/icons/hicolor/16x16/devices/gvc-3d-sound.png
+share/icons/hicolor/16x16/devices/gvc-headphones.png
+share/icons/hicolor/16x16/devices/gvc-line-in.png
+share/icons/hicolor/16x16/devices/gvc-tone.png
+share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
+share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
+share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
+share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
-share/idl/GNOME_Media_CDDBSlave2.idl
+share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
@@ -250,6 +132,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
@@ -278,9 +161,10 @@ 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
 share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
@@ -291,16 +175,9 @@ 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
-share/omf/gnome-cd/gnome-cd-C.omf
-share/omf/gnome-cd/gnome-cd-ca.omf
-share/omf/gnome-cd/gnome-cd-es.omf
-share/omf/gnome-cd/gnome-cd-fr.omf
-share/omf/gnome-cd/gnome-cd-it.omf
-share/omf/gnome-cd/gnome-cd-oc.omf
-share/omf/gnome-cd/gnome-cd-ru.omf
-share/omf/gnome-cd/gnome-cd-sv.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
@@ -310,6 +187,7 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
 share/omf/gnome-volume-control/gnome-volume-control-C.omf
 share/omf/gnome-volume-control/gnome-volume-control-ca.omf
+share/omf/gnome-volume-control/gnome-volume-control-de.omf
 share/omf/gnome-volume-control/gnome-volume-control-es.omf
 share/omf/gnome-volume-control/gnome-volume-control-fr.omf
 share/omf/gnome-volume-control/gnome-volume-control-it.omf
@@ -318,69 +196,19 @@ share/omf/gnome-volume-control/gnome-volume-control-ru.omf
 share/omf/gnome-volume-control/gnome-volume-control-sv.omf
 share/omf/gstreamer-properties/gstreamer-properties-C.omf
 share/omf/gstreamer-properties/gstreamer-properties-ca.omf
+share/omf/gstreamer-properties/gstreamer-properties-de.omf
 share/omf/gstreamer-properties/gstreamer-properties-es.omf
 share/omf/gstreamer-properties/gstreamer-properties-fr.omf
 share/omf/gstreamer-properties/gstreamer-properties-it.omf
 share/omf/gstreamer-properties/gstreamer-properties-oc.omf
 share/omf/gstreamer-properties/gstreamer-properties-ru.omf
 share/omf/gstreamer-properties/gstreamer-properties-sv.omf
-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/omf/gstreamer-properties
 @dirrm share/omf/gnome-volume-control
 @dirrm share/omf/gnome-sound-recorder
-@dirrm share/omf/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/ru/figures
@@ -393,6 +221,8 @@ share/pixmaps/gnome-cd/track.png
 @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/de/figures
+@dirrm share/gnome/help/gstreamer-properties/de
 @dirrm share/gnome/help/gstreamer-properties/ca/figures
 @dirrm share/gnome/help/gstreamer-properties/ca
 @dirrm share/gnome/help/gstreamer-properties/C/figures
@@ -410,6 +240,8 @@ share/pixmaps/gnome-cd/track.png
 @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/de/figures
+@dirrm share/gnome/help/gnome-volume-control/de
 @dirrm share/gnome/help/gnome-volume-control/ca/figures
 @dirrm share/gnome/help/gnome-volume-control/ca
 @dirrm share/gnome/help/gnome-volume-control/C/figures
@@ -429,28 +261,13 @@ share/pixmaps/gnome-cd/track.png
 @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/de/figures
+@dirrm share/gnome/help/gnome-sound-recorder/de
 @dirrm share/gnome/help/gnome-sound-recorder/ca/figures
 @dirrm share/gnome/help/gnome-sound-recorder/ca
 @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/sv/figures
-@dirrm share/gnome/help/gnome-cd/sv
-@dirrm share/gnome/help/gnome-cd/ru/figures
-@dirrm share/gnome/help/gnome-cd/ru
-@dirrm share/gnome/help/gnome-cd/oc/figures
-@dirrm share/gnome/help/gnome-cd/oc
-@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/ca/figures
-@dirrm share/gnome/help/gnome-cd/ca
-@dirrm share/gnome/help/gnome-cd/C/figures
-@dirrm share/gnome/help/gnome-cd/C
-@dirrm share/gnome/help/gnome-cd
 @dirrm share/gnome-sound-recorder/ui
 @dirrm share/gnome-sound-recorder
 @dirrm %%DATADIR%%/pixmaps
@@ -459,11 +276,14 @@ share/pixmaps/gnome-cd/track.png
 @dirrmtry share/applications
 @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/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES