svn commit: r302527 - head/audio/amarok-kde4

Alberto Villa avilla at FreeBSD.org
Tue Aug 14 18:16:41 UTC 2012 

Author: avilla
Date: Tue Aug 14 18:16:41 2012
New Revision: 302527
URL: http://svn.freebsd.org/changeset/ports/302527

Log:
  - Update to 2.6.0.
  - OPTIONSngify.
  - Make NLS implicitly optional.
  
  With a reasonable set of new features - especially related to iDevices
  management -, the release is focused on bug fixing and improving the
  overall stability. Please, read the release announcement:
  http://amarok.kde.org/en/releases/2.6

Modified:
  head/audio/amarok-kde4/Makefile   (contents, props changed)
  head/audio/amarok-kde4/distinfo   (contents, props changed)
  head/audio/amarok-kde4/pkg-plist   (contents, props changed)

Modified: head/audio/amarok-kde4/Makefile
==============================================================================
--- head/audio/amarok-kde4/Makefile	Tue Aug 14 16:35:45 2012	(r302526)
+++ head/audio/amarok-kde4/Makefile	Tue Aug 14 18:16:41 2012	(r302527)
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	2.5.0
-PORTREVISION=	3
+PORTVERSION=	2.6.0
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -20,51 +19,58 @@ LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/tag
 		ofa:${PORTSDIR}/audio/libofa \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		qjson.0:${PORTSDIR}/devel/qjson \
-		qca.2:${PORTSDIR}/devel/qca
-
+		qca.2:${PORTSDIR}/devel/qca \
+		dbus-1.3:${PORTSDIR}/devel/dbus \
+		kcddb.5:${PORTSDIR}/multimedia/kdemultimedia4
 BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator
-
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \
 		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_GETTEXT=	yes
-USE_KDE4=	kdehier kdeprefix kdelibs runtime automoc4
+USE_KDE4=	kdehier kdelibs kdeprefix runtime automoc4 strigi
 USE_MYSQL=	embedded
-USE_QT4=	gui network opengl phonon script svg webkit \
+USE_QT4=	dbus designer gui network opengl \
+		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
+USE_XORG=	x11
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-NOT_FOR_ARCHS=	sparc64
-NOT_FOR_ARCHS_REASON_sparc64=	"GCC-related build error"
+OPTIONS_DEFINE=	IPOD MP3TUNES MTP
+IPOD_DESC=	iPod support
+MP3TUNES_DESC=	MP3tunes support
 
-OPTIONS=	GPOD "iPod support" on \
-		LOUDMOUTH "Loudmouth support" on \
-		MTP "MTP device support" on
+OPTIONS_DEFAULT=	IPOD MP3TUNES MTP
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GPOD)
+.if ${ARCH} == "sparc64"
+BROKEN=		does not build on sparc64 (GCC-related error)
+.endif
+
+.if ${PORT_OPTIONS:MIPOD}
 LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
-PLIST_SUB+=	GPOD=""
+USE_GNOME+=	gdkpixbuf2 glib20
+PLIST_SUB+=	IPOD=""
 .else
-CMAKE_ARGS+=	-DWITH_Ipod:BOOL=Off
-PLIST_SUB+=	GPOD="@comment "
+CMAKE_ARGS+=	-DWITH_IPOD:BOOL=Off
+PLIST_SUB+=	IPOD="@comment "
 .endif
 
-.if defined(WITH_LOUDMOUTH)
-LIB_DEPENDS+=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
-PLIST_SUB+=	LOUDMOUTH=""
+.if ${PORT_OPTIONS:MMP3TUNES}
+LIB_DEPENDS+=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \
+		curl.6:${PORTSDIR}/ftp/curl
+USE_GNOME+=	glib20 libxml2
+PLIST_SUB+=	MP3TUNES=""
 .else
-CMAKE_ARGS+=	-DWITH_Loudmouth:BOOL=Off
-PLIST_SUB+=	LOUDMOUTH="@comment "
+CMAKE_ARGS+=	-DWITH_MP3tunes:BOOL=Off
+PLIST_SUB+=	MP3TUNES="@comment "
 .endif
 
-.if defined(WITH_MTP)
+.if ${PORT_OPTIONS:MMTP}
 LIB_DEPENDS+=	mtp.9:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	MTP=""
 .else
@@ -72,6 +78,14 @@ CMAKE_ARGS+=	-DWITH_Mtp:BOOL=Off
 PLIST_SUB+=	MTP="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-extract:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/modules/FindMySQLAmarok.cmake

Modified: head/audio/amarok-kde4/distinfo
==============================================================================
--- head/audio/amarok-kde4/distinfo	Tue Aug 14 16:35:45 2012	(r302526)
+++ head/audio/amarok-kde4/distinfo	Tue Aug 14 18:16:41 2012	(r302527)
@@ -1,2 +1,2 @@
-SHA256 (amarok-2.5.0.tar.bz2) = 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849
-SIZE (amarok-2.5.0.tar.bz2) = 46607238
+SHA256 (amarok-2.6.0.tar.bz2) = a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0
+SIZE (amarok-2.6.0.tar.bz2) = 42331208

Modified: head/audio/amarok-kde4/pkg-plist
==============================================================================
--- head/audio/amarok-kde4/pkg-plist	Tue Aug 14 16:35:45 2012	(r302526)
+++ head/audio/amarok-kde4/pkg-plist	Tue Aug 14 18:16:41 2012	(r302527)
@@ -1,12 +1,12 @@
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
-%%LOUDMOUTH%%bin/amarokmp3tunesharmonydaemon
+%%MP3TUNES%%bin/amarokmp3tunesharmonydaemon
 bin/amarokpkg
 lib/kde4/amarok_appletscript_simple_javascript.so
 lib/kde4/amarok_collection-audiocdcollection.so
 lib/kde4/amarok_collection-daapcollection.so
-%%GPOD%%lib/kde4/amarok_collection-ipodcollection.so
+%%IPOD%%lib/kde4/amarok_collection-ipodcollection.so
 %%MTP%%lib/kde4/amarok_collection-mtpcollection.so
 lib/kde4/amarok_collection-mysqlecollection.so
 lib/kde4/amarok_collection-mysqlservercollection.so
@@ -24,7 +24,6 @@ lib/kde4/amarok_context_applet_similarAr
 lib/kde4/amarok_context_applet_spectrum_analyzer.so
 lib/kde4/amarok_context_applet_tabs.so
 lib/kde4/amarok_context_applet_upcomingEvents.so
-lib/kde4/amarok_context_applet_videoclip.so
 lib/kde4/amarok_context_applet_wikipedia.so
 lib/kde4/amarok_data_engine_current.so
 lib/kde4/amarok_data_engine_info.so
@@ -35,7 +34,6 @@ lib/kde4/amarok_data_engine_similarArtis
 lib/kde4/amarok_data_engine_spectrum_analyzer.so
 lib/kde4/amarok_data_engine_tabs.so
 lib/kde4/amarok_data_engine_upcomingEvents.so
-lib/kde4/amarok_data_engine_videoclip.so
 lib/kde4/amarok_data_engine_wikipedia.so
 lib/kde4/amarok_device_massstorage.so
 lib/kde4/amarok_device_nfs.so
@@ -46,13 +44,13 @@ lib/kde4/amarok_service_ampache.so
 lib/kde4/amarok_service_jamendo.so
 lib/kde4/amarok_service_lastfm.so
 lib/kde4/amarok_service_magnatunestore.so
-%%LOUDMOUTH%%lib/kde4/amarok_service_mp3tunes.so
+%%MP3TUNES%%lib/kde4/amarok_service_mp3tunes.so
 lib/kde4/amarok_service_opmldirectory.so
 lib/kde4/kcm_amarok_service_amazonstore.so
 lib/kde4/kcm_amarok_service_ampache.so
 lib/kde4/kcm_amarok_service_lastfm.so
 lib/kde4/kcm_amarok_service_magnatunestore.so
-%%LOUDMOUTH%%lib/kde4/kcm_amarok_service_mp3tunes.so
+%%MP3TUNES%%lib/kde4/kcm_amarok_service_mp3tunes.so
 lib/libamarok-sqlcollection.so
 lib/libamarok-sqlcollection.so.1
 lib/libamarok-sqlcollection.so.1.0.0
@@ -97,7 +95,6 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
-share/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_playcount.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
@@ -112,7 +109,6 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/dynamic-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/edit-redo-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/edit-undo-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/emblem-favorite-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/favorite-genres-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-album-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-artist-amarok.png
@@ -126,12 +122,14 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/filename-genre-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-ignore-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-initial-amarok.png
+share/apps/amarok/icons/hicolor/16x16/actions/filename-last-played.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-slash-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-space-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-title-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-track-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png
+share/apps/amarok/icons/hicolor/16x16/actions/label-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/lastfm-mix-radio-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png
@@ -140,10 +138,7 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/love-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-album-cover-manager-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-album-repeat-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/media-album-shuffle-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-playlist-repeat-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/media-playlist-repeat-off-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/media-playlist-shuffle-off-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-random-albums-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-random-tracks-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-repeat-album-amarok.png
@@ -155,7 +150,6 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/media-track-edit-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-track-queue-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/media-track-remove-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/media-track-repeat-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/music-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/playlist-generator.png
 share/apps/amarok/icons/hicolor/16x16/actions/podcast-amarok.png
@@ -169,7 +163,6 @@ share/apps/amarok/icons/hicolor/16x16/ac
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-gpodder-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-amarok.png
-share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-black-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-lastfm-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-librivox-amarok.png
 share/apps/amarok/icons/hicolor/16x16/actions/view-services-magnatune-amarok.png
@@ -183,7 +176,6 @@ share/apps/amarok/icons/hicolor/22x22/ac
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
-share/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_playcount.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
@@ -198,17 +190,13 @@ share/apps/amarok/icons/hicolor/22x22/ac
 share/apps/amarok/icons/hicolor/22x22/actions/dynamic-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/edit-redo-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/edit-undo-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/emblem-favorite-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/filename-bpm-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/internet-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/love-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-album-cover-manager-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-album-repeat-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/media-album-shuffle-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-clear-playlist-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-playlist-repeat-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/media-playlist-repeat-off-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/media-playlist-shuffle-off-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-random-albums-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-random-tracks-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-repeat-album-amarok.png
@@ -220,7 +208,6 @@ share/apps/amarok/icons/hicolor/22x22/ac
 share/apps/amarok/icons/hicolor/22x22/actions/media-track-edit-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-track-queue-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/media-track-remove-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/media-track-repeat-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/music-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/playlist-generator.png
 share/apps/amarok/icons/hicolor/22x22/actions/podcast-amarok.png
@@ -233,7 +220,6 @@ share/apps/amarok/icons/hicolor/22x22/ac
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-amazon-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-gpodder-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
-share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-black-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-lastfm-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-librivox-amarok.png
 share/apps/amarok/icons/hicolor/22x22/actions/view-services-magnatune-amarok.png
@@ -250,7 +236,6 @@ share/apps/amarok/icons/hicolor/32x32/ac
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
-share/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_playcount.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
@@ -266,18 +251,14 @@ share/apps/amarok/icons/hicolor/32x32/ac
 share/apps/amarok/icons/hicolor/32x32/actions/dynamic-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/edit-redo-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/edit-undo-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/emblem-favorite-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/filename-bpm-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/love-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-album-cover-manager-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-album-cover.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-album-repeat-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/media-album-shuffle-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-album-track.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-clear-playlist-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-playlist-repeat-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/media-playlist-repeat-off-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/media-playlist-shuffle-off-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-random-albums-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-random-tracks-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-repeat-album-amarok.png
@@ -289,7 +270,6 @@ share/apps/amarok/icons/hicolor/32x32/ac
 share/apps/amarok/icons/hicolor/32x32/actions/media-track-edit-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-track-queue-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/media-track-remove-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/media-track-repeat-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/music-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/playlist-generator.png
 share/apps/amarok/icons/hicolor/32x32/actions/podcast-amarok.png
@@ -303,7 +283,6 @@ share/apps/amarok/icons/hicolor/32x32/ac
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-gpodder-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-amarok.png
-share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-black-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-lastfm-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-magnatune-amarok.png
 share/apps/amarok/icons/hicolor/32x32/actions/view-services-mp3tunes-amarok.png
@@ -316,7 +295,6 @@ share/apps/amarok/icons/hicolor/48x48/ac
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
-share/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_playcount.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
@@ -332,7 +310,6 @@ share/apps/amarok/icons/hicolor/48x48/ac
 share/apps/amarok/icons/hicolor/48x48/actions/dynamic-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/edit-redo-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/filename-and-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
@@ -363,11 +340,8 @@ share/apps/amarok/icons/hicolor/48x48/ac
 share/apps/amarok/icons/hicolor/48x48/actions/love-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-album-cover-manager-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-album-repeat-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/media-album-shuffle-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-clear-playlist-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-playlist-repeat-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/media-playlist-repeat-off-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/media-playlist-shuffle-off-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-random-albums-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-random-tracks-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-repeat-album-amarok.png
@@ -379,7 +353,6 @@ share/apps/amarok/icons/hicolor/48x48/ac
 share/apps/amarok/icons/hicolor/48x48/actions/media-track-edit-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-track-queue-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/media-track-remove-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/media-track-repeat-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/music-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/photos-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/playlist-generator.png
@@ -397,18 +370,13 @@ share/apps/amarok/icons/hicolor/48x48/ac
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-gpodder-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-amarok.png
-share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-black-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-magnatune-amarok.png
 share/apps/amarok/icons/hicolor/48x48/actions/view-services-mp3tunes-amarok.png
-share/apps/amarok/images/FilenameLayoutDialogHint.png
 share/apps/amarok/images/amarok-tabs-bass.png
 share/apps/amarok/images/amarok-tabs-drum.png
 share/apps/amarok/images/amarok-tabs-guitar.png
 share/apps/amarok/images/amarok-tabs-piano.png
-share/apps/amarok/images/amarok-videoclip-dailymotion.png
-share/apps/amarok/images/amarok-videoclip-vimeo.png
-share/apps/amarok/images/amarok-videoclip-youtube.png
 share/apps/amarok/images/amarok_icon.svg
 share/apps/amarok/images/default-theme-clean.svg
 share/apps/amarok/images/emblem-amazon.png
@@ -485,7 +453,11 @@ share/apps/amarok/images/splash_screen.j
 share/apps/amarok/images/star.png
 share/apps/amarok/images/volume_icon.png
 share/apps/amarok/images/volume_muted_icon.png
-share/apps/amarok/images/web_applet_background.svg
+share/apps/amarok/scripts/free_music_charts_service/FMCEmblem.png
+share/apps/amarok/scripts/free_music_charts_service/FMCIcon.png
+share/apps/amarok/scripts/free_music_charts_service/FMCShow.png
+share/apps/amarok/scripts/free_music_charts_service/main.js
+share/apps/amarok/scripts/free_music_charts_service/script.spec
 share/apps/amarok/scripts/librivox_service/COPYING
 share/apps/amarok/scripts/librivox_service/LibrivoxEmblem.png
 share/apps/amarok/scripts/librivox_service/LibrivoxIcon.png
@@ -502,9 +474,6 @@ share/apps/amarok/scripts/radio_station_
 share/apps/amarok/scripts/radio_station_service/script.spec
 share/apps/amarok/scripts/script_console/main.js
 share/apps/amarok/scripts/script_console/script.spec
-share/apps/desktoptheme/Amarok-Mockup/colors
-share/apps/desktoptheme/Amarok-Mockup/widgets/background.svg
-share/apps/desktoptheme/Amarok-Mockup/widgets/text-background.svgz
 share/apps/desktoptheme/default/widgets/amarok-albums.svg
 share/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
 share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
@@ -528,16 +497,23 @@ share/dbus-1/interfaces/org.kde.amarok.M
 share/doc/HTML/de/amarok/common
 share/doc/HTML/de/amarok/index.cache.bz2
 share/doc/HTML/de/amarok/index.docbook
-share/doc/HTML/en/amarok/Amarok2-4-1MergeIcon.png
-share/doc/HTML/en/amarok/Amarok2WrenchIcon.png
 share/doc/HTML/en/amarok/Face-smile.png
+share/doc/HTML/en/amarok/Icon-action-dynamic-amarok.png
 share/doc/HTML/en/amarok/Icon-application-exit.png
 share/doc/HTML/en/amarok/Icon-bookmark-new-list.png
 share/doc/HTML/en/amarok/Icon-configure.png
 share/doc/HTML/en/amarok/Icon-dialog-information.png
+share/doc/HTML/en/amarok/Icon-document-export.png
+share/doc/HTML/en/amarok/Icon-document-import.png
+share/doc/HTML/en/amarok/Icon-document-new.png
+share/doc/HTML/en/amarok/Icon-document-properties.png
 share/doc/HTML/en/amarok/Icon-document-save.png
+share/doc/HTML/en/amarok/Icon-edit-clear-list.png
 share/doc/HTML/en/amarok/Icon-edit-clear-locationbar-rtl.png
+share/doc/HTML/en/amarok/Icon-edit-copy.png
+share/doc/HTML/en/amarok/Icon-edit-delete.png
 share/doc/HTML/en/amarok/Icon-emblem-favorite.png
+share/doc/HTML/en/amarok/Icon-emblem-mounted.png
 share/doc/HTML/en/amarok/Icon-flag-green.png
 share/doc/HTML/en/amarok/Icon-folder-new.png
 share/doc/HTML/en/amarok/Icon-folder-remote.png
@@ -547,13 +523,19 @@ share/doc/HTML/en/amarok/Icon-go-next.pn
 share/doc/HTML/en/amarok/Icon-go-previous.png
 share/doc/HTML/en/amarok/Icon-go-up.png
 share/doc/HTML/en/amarok/Icon-list-add.png
+share/doc/HTML/en/amarok/Icon-list-remove.png
 share/doc/HTML/en/amarok/Icon-media-playback-pause.png
 share/doc/HTML/en/amarok/Icon-media-playback-start.png
 share/doc/HTML/en/amarok/Icon-media-playback-stop.png
+share/doc/HTML/en/amarok/Icon-preferences-other.png
+share/doc/HTML/en/amarok/Icon-view-list-tree.png
 share/doc/HTML/en/amarok/Icon-view-refresh.png
+share/doc/HTML/en/amarok/action-collection-amarok48.png
 share/doc/HTML/en/amarok/advancedtok.png
+share/doc/HTML/en/amarok/album.png
+share/doc/HTML/en/amarok/albumbar.png
+share/doc/HTML/en/amarok/amarok-apg-presets-toolbar.png
 share/doc/HTML/en/amarok/amarok-context.png
-share/doc/HTML/en/amarok/amarok-contextadd.png
 share/doc/HTML/en/amarok/amarok-e17.png
 share/doc/HTML/en/amarok/amarok-fluxbox.png
 share/doc/HTML/en/amarok/amarok-gnome.png
@@ -561,7 +543,6 @@ share/doc/HTML/en/amarok/amarok-lxde.png
 share/doc/HTML/en/amarok/amarok-mac-port-install.png
 share/doc/HTML/en/amarok/amarok-maintoolbar.png
 share/doc/HTML/en/amarok/amarok-managing-media.png
-share/doc/HTML/en/amarok/amarok-merge-icon.png
 share/doc/HTML/en/amarok/amarok-newdynamic-detail.png
 share/doc/HTML/en/amarok/amarok-newdynamic.png
 share/doc/HTML/en/amarok/amarok-renameplaylist.png
@@ -586,7 +567,6 @@ share/doc/HTML/en/amarok/amarok2-4-1phon
 share/doc/HTML/en/amarok/amarok2-4-1saveplaylistchoices.png
 share/doc/HTML/en/amarok/amarok2-4-1tageditdialog.png
 share/doc/HTML/en/amarok/amarok2-4-1viewmenu.png
-share/doc/HTML/en/amarok/amarok2-4-playlistsearchfilter.png
 share/doc/HTML/en/amarok/amarok2-4.png
 share/doc/HTML/en/amarok/amarok2-4collectionsortingmenu.png
 share/doc/HTML/en/amarok/amarok2-4helpmenu.png
@@ -600,12 +580,12 @@ share/doc/HTML/en/amarok/amarok24_config
 share/doc/HTML/en/amarok/amarok24_configureshortcutsdialog.png
 share/doc/HTML/en/amarok/amarok24_settingsmenu.png
 share/doc/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
-share/doc/HTML/en/amarok/amarok24_toolsmenu_withtwoscripts.png
 share/doc/HTML/en/amarok/amarok2_moodbar.png
 share/doc/HTML/en/amarok/amarok_add-on_installer.png
 share/doc/HTML/en/amarok/amarok_addtoplaylist.png
 share/doc/HTML/en/amarok/amarok_addtoplaylist1.png
 share/doc/HTML/en/amarok/amarok_amarokmenu2-4.png
+share/doc/HTML/en/amarok/amarok_ampache_client2.png
 share/doc/HTML/en/amarok/amarok_connecting_media_devices.png
 share/doc/HTML/en/amarok/amarok_cover_manager.png
 share/doc/HTML/en/amarok/amarok_cover_manager_newcover.png
@@ -619,26 +599,17 @@ share/doc/HTML/en/amarok/amarok_layout26
 share/doc/HTML/en/amarok/amarok_layout27.png
 share/doc/HTML/en/amarok/amarok_layout28.png
 share/doc/HTML/en/amarok/amarok_loading_media_devices.png
+share/doc/HTML/en/amarok/amarok_locale_selection.png
 share/doc/HTML/en/amarok/amarok_main_toolbar.png
 share/doc/HTML/en/amarok/amarok_media_devices.png
 share/doc/HTML/en/amarok/amarok_on_mac.png
-share/doc/HTML/en/amarok/amarok_playlist.png
-share/doc/HTML/en/amarok/amarok_playlist_bookmarking.png
-share/doc/HTML/en/amarok/amarok_playlist_contextmenu.png
-share/doc/HTML/en/amarok/amarok_playlist_functions.png
-share/doc/HTML/en/amarok/amarok_playlist_layout_d.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_d_ss.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_editor.png
-share/doc/HTML/en/amarok/amarok_playlist_layout_nog1.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_nog1_s.png
-share/doc/HTML/en/amarok/amarok_playlist_layout_nog2.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
-share/doc/HTML/en/amarok/amarok_playlist_layout_v.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_v1_s.png
 share/doc/HTML/en/amarok/amarok_playlist_manipulation.png
-share/doc/HTML/en/amarok/amarok_playlist_search2.png
 share/doc/HTML/en/amarok/amarok_playlist_search_ex.png
-share/doc/HTML/en/amarok/amarok_playlist_sortingleavel.png
 share/doc/HTML/en/amarok/amarok_removeformplaylist.png
 share/doc/HTML/en/amarok/amarok_saved_playlists.png
 share/doc/HTML/en/amarok/amarok_script_info.png
@@ -659,25 +630,24 @@ share/doc/HTML/en/amarok/amarokwindow_co
 share/doc/HTML/en/amarok/amarokwindow_mediasources.png
 share/doc/HTML/en/amarok/amarokwindow_playlist.png
 share/doc/HTML/en/amarok/apgpresetsmatchallgroup.png
+share/doc/HTML/en/amarok/app.png
 share/doc/HTML/en/amarok/applications-internet.png
+share/doc/HTML/en/amarok/bookmarking_menu.png
 share/doc/HTML/en/amarok/cd_collection_sansa.png
 share/doc/HTML/en/amarok/common
-share/doc/HTML/en/amarok/configure_amarok.png
+share/doc/HTML/en/amarok/context_menu.png
 share/doc/HTML/en/amarok/contextpane.png
 share/doc/HTML/en/amarok/contextpanestopped.png
 share/doc/HTML/en/amarok/controlamarok.png
-share/doc/HTML/en/amarok/document-new.png
 share/doc/HTML/en/amarok/document-save.png
 share/doc/HTML/en/amarok/dynamic_playlist.png
-share/doc/HTML/en/amarok/edit-copy.png
 share/doc/HTML/en/amarok/edit-redo.png
 share/doc/HTML/en/amarok/edit-undo.png
-share/doc/HTML/en/amarok/favor-menu.png
+share/doc/HTML/en/amarok/favor.png
 share/doc/HTML/en/amarok/firstruncollection2.png
 share/doc/HTML/en/amarok/folder-amarok.png
 share/doc/HTML/en/amarok/generatedlist.png
 share/doc/HTML/en/amarok/generatingtree.png
-share/doc/HTML/en/amarok/hi32-action-collection-amarok.png
 share/doc/HTML/en/amarok/hi48-action-clear-playlist-amarok.png
 share/doc/HTML/en/amarok/hi48-action-edit-playlist-queue.png
 share/doc/HTML/en/amarok/hi48-action-media-standard-track-progression-amarok.png
@@ -689,33 +659,37 @@ share/doc/HTML/en/amarok/installation1-1
 share/doc/HTML/en/amarok/installation2.png
 share/doc/HTML/en/amarok/installation3.png
 share/doc/HTML/en/amarok/installation4.png
-share/doc/HTML/en/amarok/lowerpart.png
 share/doc/HTML/en/amarok/media_sources1.png
 share/doc/HTML/en/amarok/media_sources3.png
 share/doc/HTML/en/amarok/mediasources.png
 share/doc/HTML/en/amarok/mediasources10.png
+share/doc/HTML/en/amarok/mediasources4.png
 share/doc/HTML/en/amarok/mediasources5.png
 share/doc/HTML/en/amarok/mediasources6.png
 share/doc/HTML/en/amarok/mediasources7.png
 share/doc/HTML/en/amarok/mediasources8.png
 share/doc/HTML/en/amarok/mediasourcesex.png
-share/doc/HTML/en/amarok/menuitems.png
+share/doc/HTML/en/amarok/new_amarok_configuration_options_general_edit.png
+share/doc/HTML/en/amarok/new_amarok_configuration_options_notifications_edit.png
 share/doc/HTML/en/amarok/nocover_amarok.png
 share/doc/HTML/en/amarok/oraganize_menu.png
 share/doc/HTML/en/amarok/otherplatforms_nonkde.png
 share/doc/HTML/en/amarok/otherplatforms_osx.png
 share/doc/HTML/en/amarok/otherplatforms_windows.png
-share/doc/HTML/en/amarok/playlist-album-menu.png
 share/doc/HTML/en/amarok/playlist-layout-editor-amarok.png
 share/doc/HTML/en/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/HTML/en/amarok/playlist-ordering.png
-share/doc/HTML/en/amarok/playlist.png
-share/doc/HTML/en/amarok/playlist_save_icon_amarok.png
-share/doc/HTML/en/amarok/preferences-other.png
-share/doc/HTML/en/amarok/queue_example11.png
-share/doc/HTML/en/amarok/queue_example12.png
-share/doc/HTML/en/amarok/queue_example_2.png
-share/doc/HTML/en/amarok/queue_example_4.png
+share/doc/HTML/en/amarok/playlist2.png
+share/doc/HTML/en/amarok/playlist_save.png
+share/doc/HTML/en/amarok/playlistlayout1.png
+share/doc/HTML/en/amarok/playlistlayout2.png
+share/doc/HTML/en/amarok/playlistlayout3.png
+share/doc/HTML/en/amarok/playlistlayout4.png
+share/doc/HTML/en/amarok/playlistmenu.png
+share/doc/HTML/en/amarok/playlistpic.png
+share/doc/HTML/en/amarok/playlistqueue.png
+share/doc/HTML/en/amarok/playlistsearch.png
+share/doc/HTML/en/amarok/queue.png
+share/doc/HTML/en/amarok/queueend.png
 share/doc/HTML/en/amarok/remotecollections_ampache_client.png
 share/doc/HTML/en/amarok/remotecollections_ampache_client1.png
 share/doc/HTML/en/amarok/remotecollections_ampache_client2.png
@@ -726,82 +700,32 @@ share/doc/HTML/en/amarok/remotecollectio
 share/doc/HTML/en/amarok/remotecollections_samba_server1.png
 share/doc/HTML/en/amarok/remotecollections_samba_server2.png
 share/doc/HTML/en/amarok/remotecollections_samba_server3.png
-share/doc/HTML/en/amarok/repeat-menu.png
-share/doc/HTML/en/amarok/save-playlist-menu.png
 share/doc/HTML/en/amarok/searchincollection.png
 share/doc/HTML/en/amarok/searchincollection_example_editbox.png
 share/doc/HTML/en/amarok/searchincollection_example_editbox2.png
 share/doc/HTML/en/amarok/settings-internet-amarok.png
+share/doc/HTML/en/amarok/sorting.png
+share/doc/HTML/en/amarok/sorting2.png
 share/doc/HTML/en/amarok/tagedit_fromfile_advanced.png
 share/doc/HTML/en/amarok/tagedit_fromfile_advanced_example.png
 share/doc/HTML/en/amarok/tagedit_fromfile_basic.png
 share/doc/HTML/en/amarok/tagedit_fromfile_basic_example.png
 share/doc/HTML/en/amarok/toolbar_main.png
 share/doc/HTML/en/amarok/toolbar_slim.png
+share/doc/HTML/en/amarok/toolmenu.png
 share/doc/HTML/en/amarok/tools_bookmarkmanager.png
 share/doc/HTML/en/amarok/tools_covermanager.png
 share/doc/HTML/en/amarok/tools_equalizer.png
-share/doc/HTML/en/amarok/tools_scriptmanager.png
+share/doc/HTML/en/amarok/track_progression.png
 share/doc/HTML/en/amarok/transcode_1.png
 share/doc/HTML/en/amarok/view-media-playlist.png
-share/doc/HTML/es/amarok/add_dynamic.png
-share/doc/HTML/es/amarok/amarok_playlist.png
-share/doc/HTML/es/amarok/analyzer.png
-share/doc/HTML/es/amarok/buttons.png
-share/doc/HTML/es/amarok/collection.png
 share/doc/HTML/es/amarok/common
-share/doc/HTML/es/amarok/config_appearance.png
-share/doc/HTML/es/amarok/config_collection.png
-share/doc/HTML/es/amarok/config_engine.png
-share/doc/HTML/es/amarok/config_general.png
-share/doc/HTML/es/amarok/config_osd.png
-share/doc/HTML/es/amarok/config_playback.png
-share/doc/HTML/es/amarok/config_scrobbler.png
-share/doc/HTML/es/amarok/coverman.png
-share/doc/HTML/es/amarok/dynamic_bar.png
-share/doc/HTML/es/amarok/dynamic_settings.png
-share/doc/HTML/es/amarok/equalizer.png
-share/doc/HTML/es/amarok/file_browser.png
 share/doc/HTML/es/amarok/index.cache.bz2
 share/doc/HTML/es/amarok/index.docbook
-share/doc/HTML/es/amarok/logo.png
-share/doc/HTML/es/amarok/media_device.png
-share/doc/HTML/es/amarok/menubar.png
-share/doc/HTML/es/amarok/musicbrainz.png
-share/doc/HTML/es/amarok/pl_tip1.png
-share/doc/HTML/es/amarok/play_list.png
-share/doc/HTML/es/amarok/player_window.png
-share/doc/HTML/es/amarok/playlist_browser.png
-share/doc/HTML/es/amarok/playlist_window.png
-share/doc/HTML/es/amarok/queue_manager.png
-share/doc/HTML/es/amarok/rmb_menu.png
-share/doc/HTML/es/amarok/script_manager.png
-share/doc/HTML/es/amarok/status_bar.png
-share/doc/HTML/es/amarok/tab_lyrics.png
-share/doc/HTML/es/amarok/tab_music.png
-share/doc/HTML/es/amarok/tab_wiki.png
 share/doc/HTML/es/amarok/vis_window.png
 share/doc/HTML/et/amarok/common
 share/doc/HTML/et/amarok/index.cache.bz2
 share/doc/HTML/et/amarok/index.docbook
-share/doc/HTML/fr/amarok/advanced.docbook
-share/doc/HTML/fr/amarok/common
-share/doc/HTML/fr/amarok/config.docbook
-share/doc/HTML/fr/amarok/faq.docbook
-share/doc/HTML/fr/amarok/index.cache.bz2
-share/doc/HTML/fr/amarok/index.docbook
-share/doc/HTML/fr/amarok/quick.docbook
-share/doc/HTML/fr/amarok/requirements.docbook
-share/doc/HTML/fr/amarok/using.docbook
-share/doc/HTML/it/amarok/advanced.docbook
-share/doc/HTML/it/amarok/common
-share/doc/HTML/it/amarok/config.docbook
-share/doc/HTML/it/amarok/faq.docbook
-share/doc/HTML/it/amarok/index.cache.bz2
-share/doc/HTML/it/amarok/index.docbook
-share/doc/HTML/it/amarok/quick.docbook
-share/doc/HTML/it/amarok/requirements.docbook
-share/doc/HTML/it/amarok/using.docbook
 share/doc/HTML/nl/amarok/add_dynamic.png
 share/doc/HTML/nl/amarok/amarok_playlist.png
 share/doc/HTML/nl/amarok/analyzer.png
@@ -980,12 +904,18 @@ share/doc/HTML/ru/amarok/tools_bookmarkm
 share/doc/HTML/ru/amarok/tools_covermanager.png
 share/doc/HTML/ru/amarok/tools_equalizer.png
 share/doc/HTML/ru/amarok/tools_scriptmanager.png
+share/doc/HTML/sv/amarok/amarok2-4-1configuredialogcollection.png
+share/doc/HTML/sv/amarok/amarokbreadcrumb.png
+share/doc/HTML/sv/amarok/amaroknew2-4.png
+share/doc/HTML/sv/amarok/amarokrightmenu.png
 share/doc/HTML/sv/amarok/common
+share/doc/HTML/sv/amarok/firstruncollection2.png
 share/doc/HTML/sv/amarok/index.cache.bz2
 share/doc/HTML/sv/amarok/index.docbook
 share/doc/HTML/uk/amarok/advancedtok.png
+share/doc/HTML/uk/amarok/album.png
+share/doc/HTML/uk/amarok/albumbar.png
 share/doc/HTML/uk/amarok/amarok-context.png
-share/doc/HTML/uk/amarok/amarok-contextadd.png
 share/doc/HTML/uk/amarok/amarok-maintoolbar.png
 share/doc/HTML/uk/amarok/amarok-managing-media.png
 share/doc/HTML/uk/amarok/amarok-newdynamic-detail.png
@@ -1010,7 +940,6 @@ share/doc/HTML/uk/amarok/amarok2-4-1phon
 share/doc/HTML/uk/amarok/amarok2-4-1phonondevices.png
 share/doc/HTML/uk/amarok/amarok2-4-1saveplaylistchoices.png
 share/doc/HTML/uk/amarok/amarok2-4-1viewmenu.png
-share/doc/HTML/uk/amarok/amarok2-4-playlistsearchfilter.png
 share/doc/HTML/uk/amarok/amarok2-4.png
 share/doc/HTML/uk/amarok/amarok2-4collectionsortingmenu.png
 share/doc/HTML/uk/amarok/amarok2-4helpmenu.png
@@ -1023,7 +952,6 @@ share/doc/HTML/uk/amarok/amarok24_config
 share/doc/HTML/uk/amarok/amarok24_configureshortcutsdialog.png
 share/doc/HTML/uk/amarok/amarok24_settingsmenu.png
 share/doc/HTML/uk/amarok/amarok24_settingsmenu_withreplaygain.png
-share/doc/HTML/uk/amarok/amarok24_toolsmenu_withtwoscripts.png
 share/doc/HTML/uk/amarok/amarok2_moodbar.png
 share/doc/HTML/uk/amarok/amarok_add-on_installer.png
 share/doc/HTML/uk/amarok/amarok_addtoplaylist.png
@@ -1039,24 +967,15 @@ share/doc/HTML/uk/amarok/amarok_layout25
 share/doc/HTML/uk/amarok/amarok_layout26.png
 share/doc/HTML/uk/amarok/amarok_layout27.png
 share/doc/HTML/uk/amarok/amarok_layout28.png
+share/doc/HTML/uk/amarok/amarok_locale_selection.png
 share/doc/HTML/uk/amarok/amarok_main_toolbar.png
-share/doc/HTML/uk/amarok/amarok_playlist.png
-share/doc/HTML/uk/amarok/amarok_playlist_bookmarking.png
-share/doc/HTML/uk/amarok/amarok_playlist_contextmenu.png
-share/doc/HTML/uk/amarok/amarok_playlist_functions.png
-share/doc/HTML/uk/amarok/amarok_playlist_layout_d.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_d_ss.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_editor.png
-share/doc/HTML/uk/amarok/amarok_playlist_layout_nog1.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_nog1_s.png
-share/doc/HTML/uk/amarok/amarok_playlist_layout_nog2.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_nog2_s.png
-share/doc/HTML/uk/amarok/amarok_playlist_layout_v.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_v1_s.png
 share/doc/HTML/uk/amarok/amarok_playlist_manipulation.png
-share/doc/HTML/uk/amarok/amarok_playlist_search2.png
 share/doc/HTML/uk/amarok/amarok_playlist_search_ex.png
-share/doc/HTML/uk/amarok/amarok_playlist_sortingleavel.png
 share/doc/HTML/uk/amarok/amarok_removeformplaylist.png
 share/doc/HTML/uk/amarok/amarok_saved_playlists.png
 share/doc/HTML/uk/amarok/amarok_script_info.png
@@ -1075,54 +994,66 @@ share/doc/HTML/uk/amarok/amarokwindow_co
 share/doc/HTML/uk/amarok/amarokwindow_mediasources.png
 share/doc/HTML/uk/amarok/amarokwindow_playlist.png
 share/doc/HTML/uk/amarok/apgpresetsmatchallgroup.png
+share/doc/HTML/uk/amarok/app.png
+share/doc/HTML/uk/amarok/bookmarking_menu.png
 share/doc/HTML/uk/amarok/cd_collection_sansa.png
 share/doc/HTML/uk/amarok/common
+share/doc/HTML/uk/amarok/context_menu.png
 share/doc/HTML/uk/amarok/contextpane.png
 share/doc/HTML/uk/amarok/contextpanestopped.png
 share/doc/HTML/uk/amarok/controlamarok.png
-share/doc/HTML/uk/amarok/favor-menu.png
+share/doc/HTML/uk/amarok/favor.png
 share/doc/HTML/uk/amarok/firstruncollection2.png
 share/doc/HTML/uk/amarok/generatingtree.png
 share/doc/HTML/uk/amarok/index.cache.bz2
 share/doc/HTML/uk/amarok/index.docbook
-share/doc/HTML/uk/amarok/lowerpart.png
 share/doc/HTML/uk/amarok/media_sources1.png
 share/doc/HTML/uk/amarok/media_sources3.png
 share/doc/HTML/uk/amarok/mediasources.png
 share/doc/HTML/uk/amarok/mediasources10.png
+share/doc/HTML/uk/amarok/mediasources4.png
 share/doc/HTML/uk/amarok/mediasources5.png
 share/doc/HTML/uk/amarok/mediasources6.png
 share/doc/HTML/uk/amarok/mediasources7.png
 share/doc/HTML/uk/amarok/mediasources8.png
 share/doc/HTML/uk/amarok/mediasourcesex.png
+share/doc/HTML/uk/amarok/new_amarok_configuration_options_general_edit.png
+share/doc/HTML/uk/amarok/new_amarok_configuration_options_notifications_edit.png
 share/doc/HTML/uk/amarok/oraganize_menu.png
-share/doc/HTML/uk/amarok/playlist-album-menu.png
 share/doc/HTML/uk/amarok/playlist-layout-editor-amarok.png
 share/doc/HTML/uk/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/HTML/uk/amarok/playlist-ordering.png
-share/doc/HTML/uk/amarok/playlist.png
-share/doc/HTML/uk/amarok/queue_example11.png
-share/doc/HTML/uk/amarok/queue_example12.png
-share/doc/HTML/uk/amarok/queue_example_2.png
-share/doc/HTML/uk/amarok/queue_example_4.png
+share/doc/HTML/uk/amarok/playlist2.png
+share/doc/HTML/uk/amarok/playlist_save.png
+share/doc/HTML/uk/amarok/playlistlayout1.png
+share/doc/HTML/uk/amarok/playlistlayout2.png
+share/doc/HTML/uk/amarok/playlistlayout3.png
+share/doc/HTML/uk/amarok/playlistlayout4.png
+share/doc/HTML/uk/amarok/playlistmenu.png
+share/doc/HTML/uk/amarok/playlistpic.png
+share/doc/HTML/uk/amarok/playlistqueue.png
+share/doc/HTML/uk/amarok/playlistsearch.png
+share/doc/HTML/uk/amarok/queue.png
+share/doc/HTML/uk/amarok/queueend.png
 share/doc/HTML/uk/amarok/remotecollections_ampache_client1.png
 share/doc/HTML/uk/amarok/remotecollections_client.png
 share/doc/HTML/uk/amarok/remotecollections_samba_server.png
 share/doc/HTML/uk/amarok/remotecollections_samba_server1.png
 share/doc/HTML/uk/amarok/remotecollections_samba_server2.png
 share/doc/HTML/uk/amarok/remotecollections_samba_server3.png
-share/doc/HTML/uk/amarok/repeat-menu.png
-share/doc/HTML/uk/amarok/save-playlist-menu.png
 share/doc/HTML/uk/amarok/searchincollection.png
 share/doc/HTML/uk/amarok/searchincollection_example_editbox.png
 share/doc/HTML/uk/amarok/searchincollection_example_editbox2.png
+share/doc/HTML/uk/amarok/sorting.png
+share/doc/HTML/uk/amarok/sorting2.png
 share/doc/HTML/uk/amarok/tagedit_fromfile_advanced.png
 share/doc/HTML/uk/amarok/tagedit_fromfile_basic.png
 share/doc/HTML/uk/amarok/toolbar_main.png
 share/doc/HTML/uk/amarok/toolbar_slim.png
+share/doc/HTML/uk/amarok/toolmenu.png
 share/doc/HTML/uk/amarok/tools_bookmarkmanager.png
 share/doc/HTML/uk/amarok/tools_covermanager.png
 share/doc/HTML/uk/amarok/tools_equalizer.png
+share/doc/HTML/uk/amarok/track_progression.png
 share/doc/HTML/uk/amarok/transcode_1.png
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
@@ -1142,7 +1073,6 @@ share/kde4/services/amarok-context-apple
 share/kde4/services/amarok-context-applet-spectrum-analyzer.desktop
 share/kde4/services/amarok-context-applet-tabs.desktop
 share/kde4/services/amarok-context-applet-upcomingEvents.desktop
-share/kde4/services/amarok-context-applet-videoclip.desktop
 share/kde4/services/amarok-context-applet-wikipedia.desktop
 share/kde4/services/amarok-data-engine-current.desktop
 share/kde4/services/amarok-data-engine-info.desktop
@@ -1153,14 +1083,13 @@ share/kde4/services/amarok-data-engine-s
 share/kde4/services/amarok-data-engine-spectrum-analyzer.desktop
 share/kde4/services/amarok-data-engine-tabs.desktop
 share/kde4/services/amarok-data-engine-upcomingEvents.desktop
-share/kde4/services/amarok-data-engine-videoclip.desktop
 share/kde4/services/amarok-data-engine-wikipedia.desktop
 share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
 share/kde4/services/amarok-scriptengine-runner-javascript.desktop
 share/kde4/services/amarok.protocol
 share/kde4/services/amarok_collection-audiocdcollection.desktop
 share/kde4/services/amarok_collection-daapcollection.desktop
-%%GPOD%%share/kde4/services/amarok_collection-ipodcollection.desktop
+%%IPOD%%share/kde4/services/amarok_collection-ipodcollection.desktop
 %%MTP%%share/kde4/services/amarok_collection-mtpcollection.desktop
 share/kde4/services/amarok_collection-mysqlecollection.desktop
 share/kde4/services/amarok_collection-mysqlservercollection.desktop
@@ -1179,8 +1108,8 @@ share/kde4/services/amarok_service_lastf
 share/kde4/services/amarok_service_lastfm_config.desktop
 share/kde4/services/amarok_service_magnatunestore.desktop
 share/kde4/services/amarok_service_magnatunestore_config.desktop
-%%LOUDMOUTH%%share/kde4/services/amarok_service_mp3tunes.desktop
-%%LOUDMOUTH%%share/kde4/services/amarok_service_mp3tunes_config.desktop
+%%MP3TUNES%%share/kde4/services/amarok_service_mp3tunes.desktop
+%%MP3TUNES%%share/kde4/services/amarok_service_mp3tunes_config.desktop
 share/kde4/services/amarok_service_opmldirectory.desktop
 share/kde4/services/amarokitpc.protocol
 share/kde4/services/amaroklastfm.protocol
@@ -1188,248 +1117,165 @@ share/kde4/servicetypes/amarok_codecinst
 share/kde4/servicetypes/amarok_context_applet.desktop
 share/kde4/servicetypes/amarok_data_engine.desktop
 share/kde4/servicetypes/amarok_plugin.desktop
-share/locale/af/LC_MESSAGES/amarok.mo
-share/locale/ar/LC_MESSAGES/amarok.mo
-share/locale/ast/LC_MESSAGES/amarok.mo
-share/locale/be/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/bg/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/bg/LC_MESSAGES/amarokpkg.mo
-share/locale/bs/LC_MESSAGES/amarok.mo
-share/locale/bs/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/bs/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/bs/LC_MESSAGES/amarokpkg.mo
-share/locale/ca/LC_MESSAGES/amarok.mo
-share/locale/ca/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ca/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ca/LC_MESSAGES/amarokpkg.mo
-share/locale/ca at valencia/LC_MESSAGES/amarok.mo
-share/locale/ca at valencia/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ca at valencia/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ca at valencia/LC_MESSAGES/amarokpkg.mo
-share/locale/cs/LC_MESSAGES/amarok.mo
-share/locale/cs/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/cs/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/cs/LC_MESSAGES/amarokpkg.mo
-share/locale/csb/LC_MESSAGES/amarok.mo
-share/locale/da/LC_MESSAGES/amarok.mo
-share/locale/da/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/da/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/da/LC_MESSAGES/amarokpkg.mo
-share/locale/de/LC_MESSAGES/amarok.mo
-share/locale/de/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/de/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/de/LC_MESSAGES/amarokpkg.mo
-share/locale/el/LC_MESSAGES/amarok.mo
-share/locale/el/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/el/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/el/LC_MESSAGES/amarokpkg.mo
-share/locale/en_GB/LC_MESSAGES/amarok.mo
-share/locale/en_GB/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/en_GB/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/en_GB/LC_MESSAGES/amarokpkg.mo
-share/locale/eo/LC_MESSAGES/amarok.mo
-share/locale/eo/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/eo/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/eo/LC_MESSAGES/amarokpkg.mo
-share/locale/es/LC_MESSAGES/amarok.mo
-share/locale/es/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/es/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/es/LC_MESSAGES/amarokpkg.mo
-share/locale/et/LC_MESSAGES/amarok.mo
-share/locale/et/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/et/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/et/LC_MESSAGES/amarokpkg.mo
-share/locale/eu/LC_MESSAGES/amarok.mo
-share/locale/eu/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/eu/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/eu/LC_MESSAGES/amarokpkg.mo
-share/locale/fa/LC_MESSAGES/amarok.mo
-share/locale/fa/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/fa/LC_MESSAGES/amarokpkg.mo
-share/locale/fi/LC_MESSAGES/amarok.mo
-share/locale/fi/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/fi/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/fi/LC_MESSAGES/amarokpkg.mo
-share/locale/fr/LC_MESSAGES/amarok.mo
-share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/fr/LC_MESSAGES/amarokpkg.mo
-share/locale/ga/LC_MESSAGES/amarok.mo
-share/locale/ga/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ga/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ga/LC_MESSAGES/amarokpkg.mo
-share/locale/gl/LC_MESSAGES/amarok.mo
-share/locale/gl/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/gl/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/gl/LC_MESSAGES/amarokpkg.mo
-share/locale/he/LC_MESSAGES/amarok.mo
-share/locale/hr/LC_MESSAGES/amarok.mo
-share/locale/hr/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/hr/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/hr/LC_MESSAGES/amarokpkg.mo
-share/locale/hu/LC_MESSAGES/amarok.mo
-share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/hu/LC_MESSAGES/amarokpkg.mo
-share/locale/is/LC_MESSAGES/amarok.mo
-share/locale/is/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/is/LC_MESSAGES/amarokpkg.mo
-share/locale/it/LC_MESSAGES/amarok.mo
-share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/it/LC_MESSAGES/amarokpkg.mo
-share/locale/ja/LC_MESSAGES/amarok.mo
-share/locale/ja/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ja/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ja/LC_MESSAGES/amarokpkg.mo
-share/locale/km/LC_MESSAGES/amarok.mo
-share/locale/km/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/km/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/km/LC_MESSAGES/amarokpkg.mo
-share/locale/ko/LC_MESSAGES/amarok.mo
-share/locale/ko/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ko/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ko/LC_MESSAGES/amarokpkg.mo
-share/locale/ku/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/lt/LC_MESSAGES/amarokpkg.mo
-share/locale/lv/LC_MESSAGES/amarok.mo
-share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/lv/LC_MESSAGES/amarokpkg.mo
-share/locale/mai/LC_MESSAGES/amarok.mo
-share/locale/mai/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/mai/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/mai/LC_MESSAGES/amarokpkg.mo
-share/locale/ml/LC_MESSAGES/amarok.mo
-share/locale/ms/LC_MESSAGES/amarok.mo
-share/locale/nb/LC_MESSAGES/amarok.mo
-share/locale/nb/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nb/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nb/LC_MESSAGES/amarokpkg.mo
-share/locale/nds/LC_MESSAGES/amarok.mo
-share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nds/LC_MESSAGES/amarokpkg.mo
-share/locale/ne/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nl/LC_MESSAGES/amarokpkg.mo
-share/locale/nn/LC_MESSAGES/amarok.mo
-share/locale/nn/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nn/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nn/LC_MESSAGES/amarokpkg.mo
-share/locale/oc/LC_MESSAGES/amarok.mo
-share/locale/pa/LC_MESSAGES/amarok.mo
-share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/pa/LC_MESSAGES/amarokpkg.mo
-share/locale/pl/LC_MESSAGES/amarok.mo
-share/locale/pl/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/pl/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/pl/LC_MESSAGES/amarokpkg.mo
-share/locale/pt/LC_MESSAGES/amarok.mo
-share/locale/pt/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/pt/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/pt/LC_MESSAGES/amarokpkg.mo
-share/locale/pt_BR/LC_MESSAGES/amarok.mo
-share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ro/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ro/LC_MESSAGES/amarokpkg.mo
-share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ru/LC_MESSAGES/amarokpkg.mo
-share/locale/se/LC_MESSAGES/amarok.mo
-share/locale/se/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/si/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/sk/LC_MESSAGES/amarokcollectionscanner_qt.mo

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list