Update to 2.5.0

Version 2.5
  FEATURES:
    * Now It's possible to use formated strings for prefix and suffix in
      Playlist's layout items.

  BUGFIXES:
    * Do not crash when iPod doesn't have a master playlist. (BR 288936)
    * Fix Last.fm not finding KDE Wallet. (BR 286741)
    * Put a border around bottom toolbars, visually separating them from
      browser contents. (BR 277741)
    * Align the bottom toolbars.
    * Allow albums with empty name but nonempty artist in local collection.
    * Fix collection info display (track count, free space) for iPod and MTP
      devices. (BR 232093)
    * Fix crash at exit with Qt 4.8
    * Fix moving applets rightward in the context toolbar.
    * Fix breadcrumbs not working properly for the file browser.
    * Disable cover fetching action for tracks not in the collection to avoid
      crash when trying to "save as" a cover. (BR 287604)
    * Show default cover in tag dialog when track is not in the collection.
    * Fix directory selection when opening album location in tag dialog.
    * Fix crash in CoverFoundDialog if progress dialog is cancelled just
      before fetch is done.
    * Correctly parse disambiguation pages for songs in the English Wikipedia.
    * Fix wrong context view applets sizes on start up in some cases.
    * Fix Amarok consuming CPU until main window is shown. (BR 278897)
    * Fix last.fm 'scrobble composer' option's fallback to artist (BR 286215)
    * Fix volume control from within Amarok.
    * Fix slow startup because of imported playlists. (BR 284761)
    * Fix audio CD detection on Amarok start. (BR 276032)
    * Set a default filename scheme for USB Mass Storage (BR 285900)
    * Fixed crash during MusicBrainz search. (BR 277475)

  CHANGES:
    * Load Last.fm friend/neighbour avatars on demand.
    * Update tracks in the recently played widget only when needed.
    * Allow editing the SearchWidget during a search animation.
    * Update the collection view while UMS is scanning.
    * Don't block the UI while scanning UMS device.
    * Allow going back and forward in Amazon store. Thanks to GCI student
      Nikola Miljkovic.

9 files changed, 757 insertions, 116 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 9ab753298a8..01bae886261 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2012/03/03 00:12:36 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2012/03/20 10:28:29 markd Exp $
 #
 
 DISTNAME=	amarok-${VERS}
-VERS=		2.4.0
-PKGREVISION=	8
+VERS=		2.5.0
 CATEGORIES=	audio multimedia
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +17,6 @@ DEPENDS+=	moodbar-[0-9]*:../../audio/moodbar
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	msgfmt pkg-config
 
@@ -55,6 +53,7 @@ SUBST_SED.mysql+=	-e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-se
 BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/taglib-extras/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
 .include "../../devel/qtscriptgenerator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
@@ -63,7 +62,7 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 # for plasma
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
 BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs4>=4.5.0
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 42bf9a5c5f9..d0db21064cb 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2011/01/27 17:24:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39 2012/03/20 10:28:29 markd Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -22,6 +22,7 @@ lib/kde4/amarok_context_applet_labels.so
 lib/kde4/amarok_context_applet_lyrics.so
 lib/kde4/amarok_context_applet_photos.so
 lib/kde4/amarok_context_applet_similarArtists.so
+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
@@ -32,18 +33,23 @@ lib/kde4/amarok_data_engine_labels.so
 lib/kde4/amarok_data_engine_lyrics.so
 lib/kde4/amarok_data_engine_photos.so
 lib/kde4/amarok_data_engine_similarArtists.so
+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_massstorage-device.so
+lib/kde4/amarok_device_massstorage.so
+lib/kde4/amarok_device_nfs.so
+lib/kde4/amarok_device_smb.so
 lib/kde4/amarok_runnerscript_javascript.so
+lib/kde4/amarok_service_amazonstore.so
 lib/kde4/amarok_service_ampache.so
 lib/kde4/amarok_service_jamendo.so
 lib/kde4/amarok_service_lastfm.so
 lib/kde4/amarok_service_magnatunestore.so
 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
@@ -62,13 +68,10 @@ lib/libamaroklib.so.1
 lib/libamaroklib.so.1.0.0
 lib/libamarokocsclient.so
 lib/libamarokocsclient.so.4
-lib/libamarokocsclient.so.4.5.0
+lib/libamarokocsclient.so.4.8.0
 lib/libamarokpud.so
 lib/libamarokpud.so.1
 lib/libamarokpud.so.1.0.0
-lib/libamarokqtjson.so
-lib/libamarokqtjson.so.1
-lib/libamarokqtjson.so.1.0.0
 lib/libampache_account_login.so
 share/applications/kde4/amarok.desktop
 share/applications/kde4/amarok_containers.desktop
@@ -82,59 +85,228 @@ share/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml
 share/doc/kde/HTML/de/amarok/common
 share/doc/kde/HTML/de/amarok/index.cache.bz2
 share/doc/kde/HTML/de/amarok/index.docbook
-share/doc/kde/HTML/en/amarok/Addingmusic.png
-share/doc/kde/HTML/en/amarok/Amarok-addingmusic2.png
-share/doc/kde/HTML/en/amarok/Amarok-context.png
-share/doc/kde/HTML/en/amarok/Amarok-contextadd.png
-share/doc/kde/HTML/en/amarok/Amarok-removefromplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok-renameplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok2.1covermanager.png
-share/doc/kde/HTML/en/amarok/Amarok2.1dynamicplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok2.1ipod.png
-share/doc/kde/HTML/en/amarok/Amarok2.1pleditor.png
-share/doc/kde/HTML/en/amarok/Amarok2.1rating.png
-share/doc/kde/HTML/en/amarok/Amarok2.1right.png
-share/doc/kde/HTML/en/amarok/Amarok2.1scriptmanager.png
-share/doc/kde/HTML/en/amarok/Amarok_-_internet_services.png
-share/doc/kde/HTML/en/amarok/Amarokbreadcrumb.png
-share/doc/kde/HTML/en/amarok/Amarokcollection.png
-share/doc/kde/HTML/en/amarok/Amarokfull.png
-share/doc/kde/HTML/en/amarok/Amarokmediasources-files.png
-share/doc/kde/HTML/en/amarok/Amarokmediasources-home.png
-share/doc/kde/HTML/en/amarok/Amarokrightmenu.png
-share/doc/kde/HTML/en/amarok/Amarokripcd.png
-share/doc/kde/HTML/en/amarok/Amaroksystray.png
-share/doc/kde/HTML/en/amarok/Applications-internet.png
-share/doc/kde/HTML/en/amarok/Cd_collection_sansa.png
-share/doc/kde/HTML/en/amarok/Configurecollection.png
-share/doc/kde/HTML/en/amarok/Context-applets-amarok.png
-share/doc/kde/HTML/en/amarok/Controlamarok.png
-share/doc/kde/HTML/en/amarok/Document-save.png
-share/doc/kde/HTML/en/amarok/Edit-redo.png
-share/doc/kde/HTML/en/amarok/Edit-undo.png
-share/doc/kde/HTML/en/amarok/Firstruncollection2.png
-share/doc/kde/HTML/en/amarok/Folder-amarok.png
-share/doc/kde/HTML/en/amarok/Hi32-action-collection-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-clear-playlist-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-media-standard-track-progression-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-music-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-podcast-amarok.png
-share/doc/kde/HTML/en/amarok/Mediasources.png
-share/doc/kde/HTML/en/amarok/Preferences-other.png
-share/doc/kde/HTML/en/amarok/Pud-amarok.png
-share/doc/kde/HTML/en/amarok/View-list-tree.png
-share/doc/kde/HTML/en/amarok/View-media-playlist.png
+share/doc/kde/HTML/en/amarok/Amarok2-4-1MergeIcon.png
+share/doc/kde/HTML/en/amarok/Amarok2WrenchIcon.png
+share/doc/kde/HTML/en/amarok/Face-smile.png
+share/doc/kde/HTML/en/amarok/Icon-application-exit.png
+share/doc/kde/HTML/en/amarok/Icon-bookmark-new-list.png
+share/doc/kde/HTML/en/amarok/Icon-configure.png
+share/doc/kde/HTML/en/amarok/Icon-dialog-information.png
+share/doc/kde/HTML/en/amarok/Icon-document-save.png
+share/doc/kde/HTML/en/amarok/Icon-edit-clear-locationbar-rtl.png
+share/doc/kde/HTML/en/amarok/Icon-emblem-favorite.png
+share/doc/kde/HTML/en/amarok/Icon-flag-green.png
+share/doc/kde/HTML/en/amarok/Icon-folder-new.png
+share/doc/kde/HTML/en/amarok/Icon-folder-remote.png
+share/doc/kde/HTML/en/amarok/Icon-go-down.png
+share/doc/kde/HTML/en/amarok/Icon-go-home.png
+share/doc/kde/HTML/en/amarok/Icon-go-next.png
+share/doc/kde/HTML/en/amarok/Icon-go-previous.png
+share/doc/kde/HTML/en/amarok/Icon-go-up.png
+share/doc/kde/HTML/en/amarok/Icon-list-add.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-pause.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-start.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-stop.png
+share/doc/kde/HTML/en/amarok/Icon-view-refresh.png
+share/doc/kde/HTML/en/amarok/advancedtok.png
+share/doc/kde/HTML/en/amarok/amarok-context.png
+share/doc/kde/HTML/en/amarok/amarok-contextadd.png
+share/doc/kde/HTML/en/amarok/amarok-e17.png
+share/doc/kde/HTML/en/amarok/amarok-fluxbox.png
+share/doc/kde/HTML/en/amarok/amarok-gnome.png
+share/doc/kde/HTML/en/amarok/amarok-lxde.png
+share/doc/kde/HTML/en/amarok/amarok-mac-port-install.png
+share/doc/kde/HTML/en/amarok/amarok-maintoolbar.png
+share/doc/kde/HTML/en/amarok/amarok-managing-media.png
+share/doc/kde/HTML/en/amarok/amarok-merge-icon.png
+share/doc/kde/HTML/en/amarok/amarok-newdynamic-detail.png
+share/doc/kde/HTML/en/amarok/amarok-newdynamic.png
+share/doc/kde/HTML/en/amarok/amarok-renameplaylist.png
+share/doc/kde/HTML/en/amarok/amarok-slimtoolbar.png
+share/doc/kde/HTML/en/amarok/amarok-xfce.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditpertrackdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configplayback.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configscripts.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configspeakersetup.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogplugins.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1databaseconfig.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1editfilterdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1filenamelayoutchooseroptions.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1mergedviewcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1non-mergedviewcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1notifications.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1phononbackends.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1phonondevices.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1saveplaylistchoices.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1tageditdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1viewmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4-playlistsearchfilter.png
+share/doc/kde/HTML/en/amarok/amarok2-4.png
+share/doc/kde/HTML/en/amarok/amarok2-4collectionsortingmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4helpmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4musicbrainztagger.png
+share/doc/kde/HTML/en/amarok/amarok2-4organizefilesadvanceddialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4organizefilesbasicdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4queueeditor.png
+share/doc/kde/HTML/en/amarok/amarok2-4searchplaylist.png
+share/doc/kde/HTML/en/amarok/amarok2-4transcodetracksdialog.png
+share/doc/kde/HTML/en/amarok/amarok24_configureshortcutdetail.png
+share/doc/kde/HTML/en/amarok/amarok24_configureshortcutsdialog.png
+share/doc/kde/HTML/en/amarok/amarok24_settingsmenu.png
+share/doc/kde/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
+share/doc/kde/HTML/en/amarok/amarok24_toolsmenu_withtwoscripts.png
+share/doc/kde/HTML/en/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/en/amarok/amarok_add-on_installer.png
+share/doc/kde/HTML/en/amarok/amarok_addtoplaylist.png
+share/doc/kde/HTML/en/amarok/amarok_addtoplaylist1.png
+share/doc/kde/HTML/en/amarok/amarok_amarokmenu2-4.png
+share/doc/kde/HTML/en/amarok/amarok_connecting_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_cover_manager.png
+share/doc/kde/HTML/en/amarok/amarok_cover_manager_newcover.png
+share/doc/kde/HTML/en/amarok/amarok_dynamic_playlist.png
+share/doc/kde/HTML/en/amarok/amarok_layout11.png
+share/doc/kde/HTML/en/amarok/amarok_layout22.png
+share/doc/kde/HTML/en/amarok/amarok_layout23.png
+share/doc/kde/HTML/en/amarok/amarok_layout24.png
+share/doc/kde/HTML/en/amarok/amarok_layout25.png
+share/doc/kde/HTML/en/amarok/amarok_layout26.png
+share/doc/kde/HTML/en/amarok/amarok_layout27.png
+share/doc/kde/HTML/en/amarok/amarok_layout28.png
+share/doc/kde/HTML/en/amarok/amarok_loading_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_main_toolbar.png
+share/doc/kde/HTML/en/amarok/amarok_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_on_mac.png
+share/doc/kde/HTML/en/amarok/amarok_playlist.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_bookmarking.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_contextmenu.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_functions.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_d.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_d_ss.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_editor.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog1.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog1_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog2.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_v.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_v1_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_manipulation.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_search2.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_search_ex.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_sortingleavel.png
+share/doc/kde/HTML/en/amarok/amarok_removeformplaylist.png
+share/doc/kde/HTML/en/amarok/amarok_saved_playlists.png
+share/doc/kde/HTML/en/amarok/amarok_script_info.png
+share/doc/kde/HTML/en/amarok/amarok_script_manager.png
+share/doc/kde/HTML/en/amarok/amarok_show_only_matches.png
+share/doc/kde/HTML/en/amarok/amarok_slim_toolbar.png
+share/doc/kde/HTML/en/amarok/amarok_tracks_media_devices1.png
+share/doc/kde/HTML/en/amarok/amarok_windowlayout.png
+share/doc/kde/HTML/en/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/en/amarok/amarokmediasources-files.png
+share/doc/kde/HTML/en/amarok/amarokmediasources-home.png
+share/doc/kde/HTML/en/amarok/amaroknew2-4.png
+share/doc/kde/HTML/en/amarok/amarokrightmenu.png
+share/doc/kde/HTML/en/amarok/amarokripcd.png
+share/doc/kde/HTML/en/amarok/amaroksystray.png
+share/doc/kde/HTML/en/amarok/amaroktoplevelmenus2-4.png
+share/doc/kde/HTML/en/amarok/amarokwindow_context.png
+share/doc/kde/HTML/en/amarok/amarokwindow_mediasources.png
+share/doc/kde/HTML/en/amarok/amarokwindow_playlist.png
+share/doc/kde/HTML/en/amarok/apgpresetsmatchallgroup.png
+share/doc/kde/HTML/en/amarok/applications-internet.png
+share/doc/kde/HTML/en/amarok/cd_collection_sansa.png
 share/doc/kde/HTML/en/amarok/common
+share/doc/kde/HTML/en/amarok/configure_amarok.png
+share/doc/kde/HTML/en/amarok/contextpane.png
+share/doc/kde/HTML/en/amarok/contextpanestopped.png
+share/doc/kde/HTML/en/amarok/controlamarok.png
+share/doc/kde/HTML/en/amarok/document-new.png
+share/doc/kde/HTML/en/amarok/document-save.png
+share/doc/kde/HTML/en/amarok/dynamic_playlist.png
+share/doc/kde/HTML/en/amarok/edit-copy.png
+share/doc/kde/HTML/en/amarok/edit-redo.png
+share/doc/kde/HTML/en/amarok/edit-undo.png
+share/doc/kde/HTML/en/amarok/favor-menu.png
+share/doc/kde/HTML/en/amarok/firstruncollection2.png
+share/doc/kde/HTML/en/amarok/folder-amarok.png
+share/doc/kde/HTML/en/amarok/generatedlist.png
+share/doc/kde/HTML/en/amarok/generatingtree.png
+share/doc/kde/HTML/en/amarok/hi32-action-collection-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-clear-playlist-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-edit-playlist-queue.png
+share/doc/kde/HTML/en/amarok/hi48-action-media-standard-track-progression-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-music-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-podcast-amarok.png
 share/doc/kde/HTML/en/amarok/index.cache.bz2
 share/doc/kde/HTML/en/amarok/index.docbook
+share/doc/kde/HTML/en/amarok/installation1-1.png
+share/doc/kde/HTML/en/amarok/installation2.png
+share/doc/kde/HTML/en/amarok/installation3.png
+share/doc/kde/HTML/en/amarok/installation4.png
+share/doc/kde/HTML/en/amarok/lowerpart.png
+share/doc/kde/HTML/en/amarok/media_sources1.png
+share/doc/kde/HTML/en/amarok/media_sources3.png
+share/doc/kde/HTML/en/amarok/mediasources.png
+share/doc/kde/HTML/en/amarok/mediasources10.png
+share/doc/kde/HTML/en/amarok/mediasources5.png
+share/doc/kde/HTML/en/amarok/mediasources6.png
+share/doc/kde/HTML/en/amarok/mediasources7.png
+share/doc/kde/HTML/en/amarok/mediasources8.png
+share/doc/kde/HTML/en/amarok/mediasourcesex.png
+share/doc/kde/HTML/en/amarok/menuitems.png
+share/doc/kde/HTML/en/amarok/nocover_amarok.png
+share/doc/kde/HTML/en/amarok/oraganize_menu.png
+share/doc/kde/HTML/en/amarok/otherplatforms_nonkde.png
+share/doc/kde/HTML/en/amarok/otherplatforms_osx.png
+share/doc/kde/HTML/en/amarok/otherplatforms_windows.png
+share/doc/kde/HTML/en/amarok/playlist-album-menu.png
+share/doc/kde/HTML/en/amarok/playlist-layout-editor-amarok.png
+share/doc/kde/HTML/en/amarok/playlist-layout-item-configuration-amarok.png
+share/doc/kde/HTML/en/amarok/playlist-ordering.png
+share/doc/kde/HTML/en/amarok/playlist.png
+share/doc/kde/HTML/en/amarok/playlist_save_icon_amarok.png
+share/doc/kde/HTML/en/amarok/preferences-other.png
+share/doc/kde/HTML/en/amarok/queue_example11.png
+share/doc/kde/HTML/en/amarok/queue_example12.png
+share/doc/kde/HTML/en/amarok/queue_example_2.png
+share/doc/kde/HTML/en/amarok/queue_example_4.png
+share/doc/kde/HTML/en/amarok/remotecollections_ampache_client.png
+share/doc/kde/HTML/en/amarok/remotecollections_ampache_client1.png
+share/doc/kde/HTML/en/amarok/remotecollections_ampache_client2.png
+share/doc/kde/HTML/en/amarok/remotecollections_client.png
+share/doc/kde/HTML/en/amarok/remotecollections_daap.png
+share/doc/kde/HTML/en/amarok/remotecollections_daap_config.png
+share/doc/kde/HTML/en/amarok/remotecollections_samba_server.png
+share/doc/kde/HTML/en/amarok/remotecollections_samba_server1.png
+share/doc/kde/HTML/en/amarok/remotecollections_samba_server2.png
+share/doc/kde/HTML/en/amarok/remotecollections_samba_server3.png
+share/doc/kde/HTML/en/amarok/repeat-menu.png
+share/doc/kde/HTML/en/amarok/save-playlist-menu.png
+share/doc/kde/HTML/en/amarok/searchincollection.png
+share/doc/kde/HTML/en/amarok/searchincollection_example_editbox.png
+share/doc/kde/HTML/en/amarok/searchincollection_example_editbox2.png
+share/doc/kde/HTML/en/amarok/settings-internet-amarok.png
+share/doc/kde/HTML/en/amarok/tagedit_fromfile_advanced.png
+share/doc/kde/HTML/en/amarok/tagedit_fromfile_advanced_example.png
+share/doc/kde/HTML/en/amarok/tagedit_fromfile_basic.png
+share/doc/kde/HTML/en/amarok/tagedit_fromfile_basic_example.png
+share/doc/kde/HTML/en/amarok/toolbar_main.png
+share/doc/kde/HTML/en/amarok/toolbar_slim.png
+share/doc/kde/HTML/en/amarok/tools_bookmarkmanager.png
+share/doc/kde/HTML/en/amarok/tools_covermanager.png
+share/doc/kde/HTML/en/amarok/tools_equalizer.png
+share/doc/kde/HTML/en/amarok/tools_scriptmanager.png
+share/doc/kde/HTML/en/amarok/transcode_1.png
+share/doc/kde/HTML/en/amarok/view-media-playlist.png
 share/doc/kde/HTML/es/amarok/add_dynamic.png
-share/doc/kde/HTML/es/amarok/advanced.docbook
 share/doc/kde/HTML/es/amarok/amarok_playlist.png
 share/doc/kde/HTML/es/amarok/analyzer.png
 share/doc/kde/HTML/es/amarok/buttons.png
 share/doc/kde/HTML/es/amarok/collection.png
 share/doc/kde/HTML/es/amarok/common
-share/doc/kde/HTML/es/amarok/config.docbook
 share/doc/kde/HTML/es/amarok/config_appearance.png
 share/doc/kde/HTML/es/amarok/config_collection.png
 share/doc/kde/HTML/es/amarok/config_engine.png
@@ -146,7 +318,6 @@ share/doc/kde/HTML/es/amarok/coverman.png
 share/doc/kde/HTML/es/amarok/dynamic_bar.png
 share/doc/kde/HTML/es/amarok/dynamic_settings.png
 share/doc/kde/HTML/es/amarok/equalizer.png
-share/doc/kde/HTML/es/amarok/faq.docbook
 share/doc/kde/HTML/es/amarok/file_browser.png
 share/doc/kde/HTML/es/amarok/index.cache.bz2
 share/doc/kde/HTML/es/amarok/index.docbook
@@ -160,16 +331,16 @@ share/doc/kde/HTML/es/amarok/player_window.png
 share/doc/kde/HTML/es/amarok/playlist_browser.png
 share/doc/kde/HTML/es/amarok/playlist_window.png
 share/doc/kde/HTML/es/amarok/queue_manager.png
-share/doc/kde/HTML/es/amarok/quick.docbook
-share/doc/kde/HTML/es/amarok/requirements.docbook
 share/doc/kde/HTML/es/amarok/rmb_menu.png
 share/doc/kde/HTML/es/amarok/script_manager.png
 share/doc/kde/HTML/es/amarok/status_bar.png
 share/doc/kde/HTML/es/amarok/tab_lyrics.png
 share/doc/kde/HTML/es/amarok/tab_music.png
 share/doc/kde/HTML/es/amarok/tab_wiki.png
-share/doc/kde/HTML/es/amarok/using.docbook
 share/doc/kde/HTML/es/amarok/vis_window.png
+share/doc/kde/HTML/et/amarok/common
+share/doc/kde/HTML/et/amarok/index.cache.bz2
+share/doc/kde/HTML/et/amarok/index.docbook
 share/doc/kde/HTML/fr/amarok/advanced.docbook
 share/doc/kde/HTML/fr/amarok/common
 share/doc/kde/HTML/fr/amarok/config.docbook
@@ -188,53 +359,328 @@ share/doc/kde/HTML/it/amarok/index.docbook
 share/doc/kde/HTML/it/amarok/quick.docbook
 share/doc/kde/HTML/it/amarok/requirements.docbook
 share/doc/kde/HTML/it/amarok/using.docbook
+share/doc/kde/HTML/nl/amarok/add_dynamic.png
+share/doc/kde/HTML/nl/amarok/amarok_playlist.png
+share/doc/kde/HTML/nl/amarok/analyzer.png
+share/doc/kde/HTML/nl/amarok/buttons.png
+share/doc/kde/HTML/nl/amarok/collection.png
+share/doc/kde/HTML/nl/amarok/common
+share/doc/kde/HTML/nl/amarok/config_appearance.png
+share/doc/kde/HTML/nl/amarok/config_collection.png
+share/doc/kde/HTML/nl/amarok/config_engine.png
+share/doc/kde/HTML/nl/amarok/config_general.png
+share/doc/kde/HTML/nl/amarok/config_osd.png
+share/doc/kde/HTML/nl/amarok/config_playback.png
+share/doc/kde/HTML/nl/amarok/config_scrobbler.png
+share/doc/kde/HTML/nl/amarok/context.png
+share/doc/kde/HTML/nl/amarok/coverman.png
+share/doc/kde/HTML/nl/amarok/dynamic_bar.png
+share/doc/kde/HTML/nl/amarok/dynamic_settings.png
+share/doc/kde/HTML/nl/amarok/equalizer.png
+share/doc/kde/HTML/nl/amarok/file_browser.png
+share/doc/kde/HTML/nl/amarok/index.cache.bz2
+share/doc/kde/HTML/nl/amarok/index.docbook
+share/doc/kde/HTML/nl/amarok/logo.png
+share/doc/kde/HTML/nl/amarok/media_device.png
+share/doc/kde/HTML/nl/amarok/menubar.png
+share/doc/kde/HTML/nl/amarok/musicbrainz.png
+share/doc/kde/HTML/nl/amarok/pl_browser.png
+share/doc/kde/HTML/nl/amarok/pl_tip1.png
+share/doc/kde/HTML/nl/amarok/play_list.png
+share/doc/kde/HTML/nl/amarok/player_window.png
+share/doc/kde/HTML/nl/amarok/playlist_browser.png
+share/doc/kde/HTML/nl/amarok/playlist_window.png
+share/doc/kde/HTML/nl/amarok/queue_manager.png
+share/doc/kde/HTML/nl/amarok/rmb_menu.png
+share/doc/kde/HTML/nl/amarok/script_manager.png
+share/doc/kde/HTML/nl/amarok/status_bar.png
+share/doc/kde/HTML/nl/amarok/tab_lyrics.png
+share/doc/kde/HTML/nl/amarok/tab_lyrics1.png
+share/doc/kde/HTML/nl/amarok/tab_music.png
+share/doc/kde/HTML/nl/amarok/tab_wiki.png
+share/doc/kde/HTML/nl/amarok/vis_window.png
 share/doc/kde/HTML/pt/amarok/common
 share/doc/kde/HTML/pt/amarok/index.cache.bz2
 share/doc/kde/HTML/pt/amarok/index.docbook
-share/doc/kde/HTML/pt_BR/amarok/advanced.docbook
 share/doc/kde/HTML/pt_BR/amarok/common
-share/doc/kde/HTML/pt_BR/amarok/config.docbook
-share/doc/kde/HTML/pt_BR/amarok/faq.docbook
 share/doc/kde/HTML/pt_BR/amarok/index.cache.bz2
 share/doc/kde/HTML/pt_BR/amarok/index.docbook
-share/doc/kde/HTML/pt_BR/amarok/quick.docbook
-share/doc/kde/HTML/pt_BR/amarok/requirements.docbook
-share/doc/kde/HTML/pt_BR/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/advanced.docbook
+share/doc/kde/HTML/ru/amarok/advancedtok.png
+share/doc/kde/HTML/ru/amarok/amarok-context.png
+share/doc/kde/HTML/ru/amarok/amarok-contextadd.png
+share/doc/kde/HTML/ru/amarok/amarok-maintoolbar.png
+share/doc/kde/HTML/ru/amarok/amarok-managing-media.png
+share/doc/kde/HTML/ru/amarok/amarok-managing-media1.png
+share/doc/kde/HTML/ru/amarok/amarok-renameplaylist.png
+share/doc/kde/HTML/ru/amarok/amarok-slimtoolbar.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1albumtageditdialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1albumtageditpertrackdialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configplayback.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configscripts.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configspeakersetup.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configuredialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configuredialogcollection.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1configuredialogplugins.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1databaseconfig.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1editfilterdialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1filenamelayoutchooseroptions.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1mergedviewcollection.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1non-mergedviewcollection.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1notifications.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1phononbackends.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1phonondevices.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1saveplaylistchoices.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1tageditdialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-1viewmenu.png
+share/doc/kde/HTML/ru/amarok/amarok2-4-playlistsearchfilter.png
+share/doc/kde/HTML/ru/amarok/amarok2-4collectionsortingmenu.png
+share/doc/kde/HTML/ru/amarok/amarok2-4helpmenu.png
+share/doc/kde/HTML/ru/amarok/amarok2-4musicbrainztagger.png
+share/doc/kde/HTML/ru/amarok/amarok2-4organizefilesadvanceddialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4organizefilesbasicdialog.png
+share/doc/kde/HTML/ru/amarok/amarok2-4searchplaylist.png
+share/doc/kde/HTML/ru/amarok/amarok24_configureshortcutdetail.png
+share/doc/kde/HTML/ru/amarok/amarok24_configureshortcutsdialog.png
+share/doc/kde/HTML/ru/amarok/amarok24_settingsmenu.png
+share/doc/kde/HTML/ru/amarok/amarok24_settingsmenu_withreplaygain.png
+share/doc/kde/HTML/ru/amarok/amarok24_toolsmenu_withtwoscripts.png
+share/doc/kde/HTML/ru/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/ru/amarok/amarok3_moodbar.png
+share/doc/kde/HTML/ru/amarok/amarok_add-on_installer.png
+share/doc/kde/HTML/ru/amarok/amarok_addtoplaylist.png
+share/doc/kde/HTML/ru/amarok/amarok_addtoplaylist1.png
+share/doc/kde/HTML/ru/amarok/amarok_amarokmenu2-4.png
+share/doc/kde/HTML/ru/amarok/amarok_connecting_media_devices.png
+share/doc/kde/HTML/ru/amarok/amarok_cover_manager_newcover.png
+share/doc/kde/HTML/ru/amarok/amarok_layout11.png
+share/doc/kde/HTML/ru/amarok/amarok_layout22.png
+share/doc/kde/HTML/ru/amarok/amarok_layout23.png
+share/doc/kde/HTML/ru/amarok/amarok_layout24.png
+share/doc/kde/HTML/ru/amarok/amarok_layout25.png
+share/doc/kde/HTML/ru/amarok/amarok_layout26.png
+share/doc/kde/HTML/ru/amarok/amarok_layout27.png
+share/doc/kde/HTML/ru/amarok/amarok_layout28.png
+share/doc/kde/HTML/ru/amarok/amarok_loading_media_devices.png
+share/doc/kde/HTML/ru/amarok/amarok_main_toolbar.png
+share/doc/kde/HTML/ru/amarok/amarok_media_devices.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_contextmenu.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_d.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_d_ss.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_editor.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_nog1.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_nog1_s.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_nog2.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_nog2_s.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_v.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_layout_v1_s.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_manipulation.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_search2.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_search_ex.png
+share/doc/kde/HTML/ru/amarok/amarok_playlist_sortingleavel.png
+share/doc/kde/HTML/ru/amarok/amarok_removeformplaylist.png
+share/doc/kde/HTML/ru/amarok/amarok_saved_playlists.png
+share/doc/kde/HTML/ru/amarok/amarok_script_info.png
+share/doc/kde/HTML/ru/amarok/amarok_show_only_matches.png
+share/doc/kde/HTML/ru/amarok/amarok_slim_toolbar.png
+share/doc/kde/HTML/ru/amarok/amarok_tracks_media_devices1.png
+share/doc/kde/HTML/ru/amarok/amarok_windowlayout.png
+share/doc/kde/HTML/ru/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/ru/amarok/amarokmediasources-files.png
+share/doc/kde/HTML/ru/amarok/amarokmediasources-home.png
+share/doc/kde/HTML/ru/amarok/amaroknew2-4.png
+share/doc/kde/HTML/ru/amarok/amarokrightmenu.png
+share/doc/kde/HTML/ru/amarok/amaroktoplevelmenus2-4.png
+share/doc/kde/HTML/ru/amarok/amarokwindow_context.png
+share/doc/kde/HTML/ru/amarok/amarokwindow_mediasources.png
+share/doc/kde/HTML/ru/amarok/amarokwindow_playlist.png
+share/doc/kde/HTML/ru/amarok/apgpresetsmatchallgroup.png
+share/doc/kde/HTML/ru/amarok/common
+share/doc/kde/HTML/ru/amarok/contextpane.png
+share/doc/kde/HTML/ru/amarok/contextpanestopped.png
+share/doc/kde/HTML/ru/amarok/controlamarok.png
+share/doc/kde/HTML/ru/amarok/dynamic_playlist.png
+share/doc/kde/HTML/ru/amarok/favor-menu.png
+share/doc/kde/HTML/ru/amarok/index.cache.bz2
+share/doc/kde/HTML/ru/amarok/index.docbook
+share/doc/kde/HTML/ru/amarok/lowerpart.png
+share/doc/kde/HTML/ru/amarok/media_sources1.png
+share/doc/kde/HTML/ru/amarok/media_sources3.png
+share/doc/kde/HTML/ru/amarok/mediasources10.png
+share/doc/kde/HTML/ru/amarok/mediasources5.png
+share/doc/kde/HTML/ru/amarok/mediasources6.png
+share/doc/kde/HTML/ru/amarok/mediasources7.png
+share/doc/kde/HTML/ru/amarok/mediasources8.png
+share/doc/kde/HTML/ru/amarok/mediasourcesex.png
+share/doc/kde/HTML/ru/amarok/oraganize_menu.png
+share/doc/kde/HTML/ru/amarok/playlist-album-menu.png
+share/doc/kde/HTML/ru/amarok/playlist-layout-editor-amarok.png
+share/doc/kde/HTML/ru/amarok/playlist-layout-item-configuration-amarok.png
+share/doc/kde/HTML/ru/amarok/playlist-ordering.png
+share/doc/kde/HTML/ru/amarok/playlist.png
+share/doc/kde/HTML/ru/amarok/queue_example11.png
+share/doc/kde/HTML/ru/amarok/queue_example12.png
+share/doc/kde/HTML/ru/amarok/queue_example_2.png
+share/doc/kde/HTML/ru/amarok/queue_example_4.png
+share/doc/kde/HTML/ru/amarok/remotecollections_ampache_client1.png
+share/doc/kde/HTML/ru/amarok/remotecollections_client.png
+share/doc/kde/HTML/ru/amarok/remotecollections_samba_server.png
+share/doc/kde/HTML/ru/amarok/repeat-menu.png
+share/doc/kde/HTML/ru/amarok/searchincollection.png
+share/doc/kde/HTML/ru/amarok/searchincollection_example_editbox.png
+share/doc/kde/HTML/ru/amarok/searchincollection_example_editbox2.png
+share/doc/kde/HTML/ru/amarok/tagedit_fromfile_advanced.png
+share/doc/kde/HTML/ru/amarok/tagedit_fromfile_basic.png
+share/doc/kde/HTML/ru/amarok/toolbar_main.png
+share/doc/kde/HTML/ru/amarok/toolbar_slim.png
+share/doc/kde/HTML/ru/amarok/tools_bookmarkmanager.png
+share/doc/kde/HTML/ru/amarok/tools_covermanager.png
+share/doc/kde/HTML/ru/amarok/tools_equalizer.png
+share/doc/kde/HTML/ru/amarok/tools_scriptmanager.png
 share/doc/kde/HTML/sv/amarok/common
-share/doc/kde/HTML/sv/amarok/config.docbook
-share/doc/kde/HTML/sv/amarok/faq.docbook
 share/doc/kde/HTML/sv/amarok/index.cache.bz2
 share/doc/kde/HTML/sv/amarok/index.docbook
-share/doc/kde/HTML/sv/amarok/quick.docbook
-share/doc/kde/HTML/sv/amarok/requirements.docbook
-share/doc/kde/HTML/sv/amarok/using.docbook
-share/doc/kde/HTML/uk/amarok/Addingmusic.png
-share/doc/kde/HTML/uk/amarok/Amarok-context.png
-share/doc/kde/HTML/uk/amarok/Amarok-contextadd.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1covermanager.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1dynamicplaylist.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1ipod.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1pleditor.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1rating.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1right.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1scriptmanager.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1svn965006.png
-share/doc/kde/HTML/uk/amarok/Amarok_-_context_view_configuration.png
-share/doc/kde/HTML/uk/amarok/Amarok_-_internet_services.png
-share/doc/kde/HTML/uk/amarok/Amarokbreadcrumb.png
-share/doc/kde/HTML/uk/amarok/Amarokcollection.png
-share/doc/kde/HTML/uk/amarok/Amarokfull.png
-share/doc/kde/HTML/uk/amarok/Amarokmediasources-home.png
-share/doc/kde/HTML/uk/amarok/Amarokrightmenu.png
-share/doc/kde/HTML/uk/amarok/Amarokripcd.png
-share/doc/kde/HTML/uk/amarok/Configurecollection.png
-share/doc/kde/HTML/uk/amarok/Context-applets-amarok.png
-share/doc/kde/HTML/uk/amarok/Firstruncollection2.png
-share/doc/kde/HTML/uk/amarok/Mediasources.png
+share/doc/kde/HTML/uk/amarok/advancedtok.png
+share/doc/kde/HTML/uk/amarok/amarok-context.png
+share/doc/kde/HTML/uk/amarok/amarok-contextadd.png
+share/doc/kde/HTML/uk/amarok/amarok-maintoolbar.png
+share/doc/kde/HTML/uk/amarok/amarok-managing-media.png
+share/doc/kde/HTML/uk/amarok/amarok-newdynamic-detail.png
+share/doc/kde/HTML/uk/amarok/amarok-newdynamic.png
+share/doc/kde/HTML/uk/amarok/amarok-renameplaylist.png
+share/doc/kde/HTML/uk/amarok/amarok-slimtoolbar.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1albumtageditdialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1albumtageditpertrackdialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configplayback.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configscripts.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configspeakersetup.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialogcollection.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialogplugins.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1databaseconfig.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1editfilterdialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1filenamelayoutchooseroptions.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1mergedviewcollection.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1non-mergedviewcollection.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1notifications.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1phononbackends.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1phonondevices.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1saveplaylistchoices.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1viewmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-playlistsearchfilter.png
+share/doc/kde/HTML/uk/amarok/amarok2-4.png
+share/doc/kde/HTML/uk/amarok/amarok2-4collectionsortingmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-4helpmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-4musicbrainztagger.png
+share/doc/kde/HTML/uk/amarok/amarok2-4organizefilesadvanceddialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4organizefilesbasicdialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-4searchplaylist.png
+share/doc/kde/HTML/uk/amarok/amarok2-4transcodetracksdialog.png
+share/doc/kde/HTML/uk/amarok/amarok24_configureshortcutdetail.png
+share/doc/kde/HTML/uk/amarok/amarok24_configureshortcutsdialog.png
+share/doc/kde/HTML/uk/amarok/amarok24_settingsmenu.png
+share/doc/kde/HTML/uk/amarok/amarok24_settingsmenu_withreplaygain.png
+share/doc/kde/HTML/uk/amarok/amarok24_toolsmenu_withtwoscripts.png
+share/doc/kde/HTML/uk/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/uk/amarok/amarok_add-on_installer.png
+share/doc/kde/HTML/uk/amarok/amarok_addtoplaylist.png
+share/doc/kde/HTML/uk/amarok/amarok_addtoplaylist1.png
+share/doc/kde/HTML/uk/amarok/amarok_amarokmenu2-4.png
+share/doc/kde/HTML/uk/amarok/amarok_cover_manager.png
+share/doc/kde/HTML/uk/amarok/amarok_cover_manager_newcover.png
+share/doc/kde/HTML/uk/amarok/amarok_layout11.png
+share/doc/kde/HTML/uk/amarok/amarok_layout22.png
+share/doc/kde/HTML/uk/amarok/amarok_layout23.png
+share/doc/kde/HTML/uk/amarok/amarok_layout24.png
+share/doc/kde/HTML/uk/amarok/amarok_layout25.png
+share/doc/kde/HTML/uk/amarok/amarok_layout26.png
+share/doc/kde/HTML/uk/amarok/amarok_layout27.png
+share/doc/kde/HTML/uk/amarok/amarok_layout28.png
+share/doc/kde/HTML/uk/amarok/amarok_main_toolbar.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_bookmarking.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_contextmenu.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_functions.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_d.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_d_ss.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_editor.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog1.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog1_s.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog2.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog2_s.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_v.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_v1_s.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_manipulation.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_search2.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_search_ex.png
+share/doc/kde/HTML/uk/amarok/amarok_playlist_sortingleavel.png
+share/doc/kde/HTML/uk/amarok/amarok_removeformplaylist.png
+share/doc/kde/HTML/uk/amarok/amarok_saved_playlists.png
+share/doc/kde/HTML/uk/amarok/amarok_script_info.png
+share/doc/kde/HTML/uk/amarok/amarok_show_only_matches.png
+share/doc/kde/HTML/uk/amarok/amarok_slim_toolbar.png
+share/doc/kde/HTML/uk/amarok/amarok_tracks_media_devices1.png
+share/doc/kde/HTML/uk/amarok/amarok_windowlayout.png
+share/doc/kde/HTML/uk/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/uk/amarok/amarokmediasources-files.png
+share/doc/kde/HTML/uk/amarok/amarokmediasources-home.png
+share/doc/kde/HTML/uk/amarok/amaroknew2-4.png
+share/doc/kde/HTML/uk/amarok/amarokrightmenu.png
+share/doc/kde/HTML/uk/amarok/amarokripcd.png
+share/doc/kde/HTML/uk/amarok/amaroksystray.png
+share/doc/kde/HTML/uk/amarok/amarokwindow_context.png
+share/doc/kde/HTML/uk/amarok/amarokwindow_mediasources.png
+share/doc/kde/HTML/uk/amarok/amarokwindow_playlist.png
+share/doc/kde/HTML/uk/amarok/apgpresetsmatchallgroup.png
+share/doc/kde/HTML/uk/amarok/cd_collection_sansa.png
 share/doc/kde/HTML/uk/amarok/common
+share/doc/kde/HTML/uk/amarok/contextpane.png
+share/doc/kde/HTML/uk/amarok/contextpanestopped.png
+share/doc/kde/HTML/uk/amarok/controlamarok.png
+share/doc/kde/HTML/uk/amarok/favor-menu.png
+share/doc/kde/HTML/uk/amarok/firstruncollection2.png
+share/doc/kde/HTML/uk/amarok/generatingtree.png
 share/doc/kde/HTML/uk/amarok/index.cache.bz2
 share/doc/kde/HTML/uk/amarok/index.docbook
+share/doc/kde/HTML/uk/amarok/lowerpart.png
+share/doc/kde/HTML/uk/amarok/media_sources1.png
+share/doc/kde/HTML/uk/amarok/media_sources3.png
+share/doc/kde/HTML/uk/amarok/mediasources.png
+share/doc/kde/HTML/uk/amarok/mediasources10.png
+share/doc/kde/HTML/uk/amarok/mediasources5.png
+share/doc/kde/HTML/uk/amarok/mediasources6.png
+share/doc/kde/HTML/uk/amarok/mediasources7.png
+share/doc/kde/HTML/uk/amarok/mediasources8.png
+share/doc/kde/HTML/uk/amarok/mediasourcesex.png
+share/doc/kde/HTML/uk/amarok/oraganize_menu.png
+share/doc/kde/HTML/uk/amarok/playlist-album-menu.png
+share/doc/kde/HTML/uk/amarok/playlist-layout-editor-amarok.png
+share/doc/kde/HTML/uk/amarok/playlist-layout-item-configuration-amarok.png
+share/doc/kde/HTML/uk/amarok/playlist-ordering.png
+share/doc/kde/HTML/uk/amarok/playlist.png
+share/doc/kde/HTML/uk/amarok/queue_example11.png
+share/doc/kde/HTML/uk/amarok/queue_example12.png
+share/doc/kde/HTML/uk/amarok/queue_example_2.png
+share/doc/kde/HTML/uk/amarok/queue_example_4.png
+share/doc/kde/HTML/uk/amarok/remotecollections_ampache_client1.png
+share/doc/kde/HTML/uk/amarok/remotecollections_client.png
+share/doc/kde/HTML/uk/amarok/remotecollections_samba_server.png
+share/doc/kde/HTML/uk/amarok/remotecollections_samba_server1.png
+share/doc/kde/HTML/uk/amarok/remotecollections_samba_server2.png
+share/doc/kde/HTML/uk/amarok/remotecollections_samba_server3.png
+share/doc/kde/HTML/uk/amarok/repeat-menu.png
+share/doc/kde/HTML/uk/amarok/save-playlist-menu.png
+share/doc/kde/HTML/uk/amarok/searchincollection.png
+share/doc/kde/HTML/uk/amarok/searchincollection_example_editbox.png
+share/doc/kde/HTML/uk/amarok/searchincollection_example_editbox2.png
+share/doc/kde/HTML/uk/amarok/tagedit_fromfile_advanced.png
+share/doc/kde/HTML/uk/amarok/tagedit_fromfile_basic.png
+share/doc/kde/HTML/uk/amarok/toolbar_main.png
+share/doc/kde/HTML/uk/amarok/toolbar_slim.png
+share/doc/kde/HTML/uk/amarok/tools_bookmarkmanager.png
+share/doc/kde/HTML/uk/amarok/tools_covermanager.png
+share/doc/kde/HTML/uk/amarok/tools_equalizer.png
+share/doc/kde/HTML/uk/amarok/transcode_1.png
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
 share/icons/hicolor/22x22/apps/amarok.png
@@ -245,17 +691,22 @@ share/kde/apps/amarok/amarok.notifyrc
 share/kde/apps/amarok/data/DefaultPlaylistLayouts.xml
 share/kde/apps/amarok/data/InfoAppletCustomStyle.css
 share/kde/apps/amarok/data/InfoParserLoading.html
+share/kde/apps/amarok/data/SpectrumAnalyzerAppletCustomStyle.css
 share/kde/apps/amarok/data/WikipediaCustomStyle.css
 share/kde/apps/amarok/data/bullet.gif
 share/kde/apps/amarok/data/first_run_jingle.ogg
 share/kde/apps/amarok/data/hover_info_template.html
 share/kde/apps/amarok/data/info_frontpage.html
+share/kde/apps/amarok/data/podcast_directory.opml
 share/kde/apps/amarok/data/upcoming-events-map.html
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-low-amarok.png
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-medium-amarok.png
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-muted-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_cart_add.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_cart_remove.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_cart_view.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
@@ -327,7 +778,9 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-multimedia-player-
 share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-gpodder-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-black-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-lastfm-amarok.png
@@ -337,6 +790,9 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-mp3tunes-amarok.
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-opml-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-scripted-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_cart_add.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_cart_remove.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_cart_view.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
@@ -387,6 +843,8 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-multimedia-player-
 share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-amazon-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-gpodder-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-black-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-lastfm-amarok.png
@@ -399,6 +857,9 @@ share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-friends-amarok.png
 share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-neighbours-amarok.png
 share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-tags-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_cart_add.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_cart_remove.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_cart_view.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
@@ -451,7 +912,9 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-multimedia-player-
 share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-gpodder-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-black-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-lastfm-amarok.png
@@ -460,6 +923,9 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-mp3tunes-amarok.
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-opml-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-scripted-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_cart_add.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_cart_remove.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_cart_view.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
@@ -481,6 +947,7 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-redo-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-and-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-bpm-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-comment-amarok.png
@@ -539,7 +1006,9 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/similarartists-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/upcomingevents-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-gpodder-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-black-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.png
@@ -555,12 +1024,15 @@ share/kde/apps/amarok/images/amarok-videoclip-vimeo.png
 share/kde/apps/amarok/images/amarok-videoclip-youtube.png
 share/kde/apps/amarok/images/amarok_icon.svg
 share/kde/apps/amarok/images/default-theme-clean.svg
+share/kde/apps/amarok/images/emblem-amazon.png
 share/kde/apps/amarok/images/emblem-ampache-scalable.svgz
 share/kde/apps/amarok/images/emblem-ampache.png
 share/kde/apps/amarok/images/emblem-default.png
 share/kde/apps/amarok/images/emblem-delicious.png
 share/kde/apps/amarok/images/emblem-digg.png
 share/kde/apps/amarok/images/emblem-facebook.png
+share/kde/apps/amarok/images/emblem-gpodder-scalable.svgz
+share/kde/apps/amarok/images/emblem-gpodder.png
 share/kde/apps/amarok/images/emblem-identica.png
 share/kde/apps/amarok/images/emblem-jamendo-scalable.svgz
 share/kde/apps/amarok/images/emblem-jamendo.png
@@ -577,6 +1049,7 @@ share/kde/apps/amarok/images/emblem-stackoverflow.png
 share/kde/apps/amarok/images/emblem-twitter.png
 share/kde/apps/amarok/images/emblem-wikipedia.png
 share/kde/apps/amarok/images/emblem-xing.png
+share/kde/apps/amarok/images/hover_info_amazon.png
 share/kde/apps/amarok/images/hover_info_ampache.png
 share/kde/apps/amarok/images/hover_info_collections.png
 share/kde/apps/amarok/images/hover_info_dynamic_playlists.png
@@ -648,8 +1121,11 @@ share/kde/apps/desktoptheme/Amarok-Mockup/widgets/text-background.svgz
 share/kde/apps/desktoptheme/default/widgets/amarok-albums.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-info-applet.svg
+share/kde/apps/desktoptheme/default/widgets/amarok-spectrum-analyzer-applet.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
+share/kde/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
+share/kde/apps/kconf_update/amarok.upd
 share/kde/apps/solid/actions/amarok-play-audiocd.desktop
 share/kde/config.kcfg/amarokconfig.kcfg
 share/kde/config/amarok.knsrc
@@ -664,6 +1140,7 @@ share/kde4/services/amarok-context-applet-labels.desktop
 share/kde4/services/amarok-context-applet-lyrics.desktop
 share/kde4/services/amarok-context-applet-photos.desktop
 share/kde4/services/amarok-context-applet-similarArtists.desktop
+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
@@ -674,6 +1151,7 @@ share/kde4/services/amarok-data-engine-labels.desktop
 share/kde4/services/amarok-data-engine-lyrics.desktop
 share/kde4/services/amarok-data-engine-photos.desktop
 share/kde4/services/amarok-data-engine-similarArtists.desktop
+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
@@ -690,7 +1168,11 @@ share/kde4/services/amarok_collection-mysqlservercollection.desktop
 share/kde4/services/amarok_collection-playdarcollection.desktop
 share/kde4/services/amarok_collection-umscollection.desktop
 share/kde4/services/amarok_collection-upnpcollection.desktop
-share/kde4/services/amarok_massstorage-device.desktop
+share/kde4/services/amarok_device_massstorage.desktop
+share/kde4/services/amarok_device_nfs.desktop
+share/kde4/services/amarok_device_smb.desktop
+share/kde4/services/amarok_service_amazonstore.desktop
+share/kde4/services/amarok_service_amazonstore_config.desktop
 share/kde4/services/amarok_service_ampache.desktop
 share/kde4/services/amarok_service_ampache_config.desktop
 share/kde4/services/amarok_service_jamendo.desktop
@@ -707,6 +1189,18 @@ share/kde4/servicetypes/amarok_codecinstall.desktop
 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
@@ -719,6 +1213,7 @@ 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
@@ -727,10 +1222,18 @@ 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
@@ -739,6 +1242,17 @@ 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
@@ -747,10 +1261,22 @@ 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
@@ -759,6 +1285,15 @@ 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
@@ -767,6 +1302,12 @@ 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
@@ -775,10 +1316,16 @@ 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
@@ -794,14 +1341,29 @@ 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
+share/locale/sk/LC_MESSAGES/amarokpkg.mo
 share/locale/sl/LC_MESSAGES/amarok.mo
 share/locale/sl/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sl/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sl/LC_MESSAGES/amarokpkg.mo
+share/locale/sq/LC_MESSAGES/amarok.mo
+share/locale/sq/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sq/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sq/LC_MESSAGES/amarokpkg.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
 share/locale/sr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -822,6 +1384,17 @@ share/locale/sv/LC_MESSAGES/amarok.mo
 share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sv/LC_MESSAGES/amarokpkg.mo
+share/locale/tg/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarokpkg.mo
+share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/tr/LC_MESSAGES/amarokpkg.mo
+share/locale/ug/LC_MESSAGES/amarok.mo
+share/locale/ug/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ug/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ug/LC_MESSAGES/amarokpkg.mo
 share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 715300d67eb..645a415778d 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.47 2011/08/05 14:21:31 abs Exp $
+$NetBSD: distinfo,v 1.48 2012/03/20 10:28:29 markd Exp $
 
-SHA1 (amarok-2.4.0.tar.bz2) = d37ecda0fecdba88bb239f11c6d4ff885d7ac23f
-RMD160 (amarok-2.4.0.tar.bz2) = f32a664521b9827ef8e7d49100e39b69fa87dd29
-Size (amarok-2.4.0.tar.bz2) = 15219572 bytes
-SHA1 (patch-CMakeLists.txt) = 3ac402cd841e8e98198a372fd697b17f4be4ab33
+SHA1 (amarok-2.5.0.tar.bz2) = 9849900d20225e703c43d242650a8fa211cf15f2
+RMD160 (amarok-2.5.0.tar.bz2) = 4506d4b4b1b11378d25ad488f3bdba54cd9b7567
+Size (amarok-2.5.0.tar.bz2) = 46607238 bytes
 SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
+SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f
+SHA1 (patch-src_context_widgets_RatingWidget.cpp) = 67d84170eacbd139ffa1f8159ad941f0f369a44a
+SHA1 (patch-src_dialogs_TagDialogBase.ui) = f81f7832ed0dbb4b635162dca2ef7d2145d6cd14
+SHA1 (patch-src_playlist_view_listview_PrettyItemDelegate.cpp) = 1c8f8c2d310b6ad08b2894d0941000b0935adc9f
+SHA1 (patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui) = d11a057fd51ee9c00fef47ffdd3c66ff8fd0995b
diff --git a/audio/amarok/patches/patch-CMakeLists.txt b/audio/amarok/patches/patch-CMakeLists.txt
deleted file mode 100644
index bb473df0b87..00000000000
--- a/audio/amarok/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2011/08/05 14:21:31 abs Exp $
-At time of writing pkgsrc includes taglib 1.10, whih the cmake check
-incorrectly views as older than 1.6, so just update the check to match
-1.10 or later...
-
---- CMakeLists.txt.orig	2011-08-01 15:23:14.000000000 +0000
-+++ CMakeLists.txt
-@@ -13,7 +13,7 @@ option(WITH_MYSQL_EMBEDDED "Build the em
- include(CheckLibraryExists)
- check_library_exists(dl dlopen "" LIBDL_FOUND)
- 
--set(TAGLIB_MIN_VERSION "1.6")
-+set(TAGLIB_MIN_VERSION "1.10")
- find_package(Taglib REQUIRED)
- 
- # Check if TagLib is built with ASF and MP4 support
diff --git a/audio/amarok/patches/patch-cmake_modules_FindTagLib.cmake b/audio/amarok/patches/patch-cmake_modules_FindTagLib.cmake
new file mode 100644
index 00000000000..061f829acc2
--- /dev/null
+++ b/audio/amarok/patches/patch-cmake_modules_FindTagLib.cmake
@@ -0,0 +1,29 @@
+$NetBSD: patch-cmake_modules_FindTagLib.cmake,v 1.1 2012/03/20 10:28:29 markd Exp $
+
+Change the string comparision operator on the TAGLIB_VERSION to a 
+version comparision operator (since versions are being compared.)
+
+--- cmake/modules/FindTaglib.cmake.orig	2011-01-11 15:58:05.000000000 +0000
++++ cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp b/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp
new file mode 100644
index 00000000000..efe83f32fba
--- /dev/null
+++ b/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_context_widgets_RatingWidget.cpp,v 1.1 2012/03/20 10:28:29 markd Exp $
+
+--- src/context/widgets/RatingWidget.cpp.orig	2011-12-15 07:36:48.000000000 +0000
++++ src/context/widgets/RatingWidget.cpp
+@@ -39,7 +39,7 @@
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+ 
+-using namespace Amarok;
++// using namespace Amarok;
+ 
+ class RatingWidget::Private
+ {
diff --git a/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui b/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui
new file mode 100644
index 00000000000..4231d010cda
--- /dev/null
+++ b/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_dialogs_TagDialogBase.ui,v 1.1 2012/03/20 10:28:29 markd Exp $
+
+--- src/dialogs/TagDialogBase.ui.orig	2011-12-15 07:36:48.000000000 +0000
++++ src/dialogs/TagDialogBase.ui
+@@ -376,7 +376,7 @@
+             </widget>
+            </item>
+            <item row="2" column="3">
+-            <widget class="Amarok::KRatingWidget" name="ratingWidget">
++            <widget class="KRatingWidget" name="ratingWidget">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
diff --git a/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp b/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp
new file mode 100644
index 00000000000..bf97f965fd2
--- /dev/null
+++ b/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_playlist_view_listview_PrettyItemDelegate.cpp,v 1.1 2012/03/20 10:28:29 markd Exp $
+
+--- src/playlist/view/listview/PrettyItemDelegate.cpp.orig	2011-12-15 07:36:48.000000000 +0000
++++ src/playlist/view/listview/PrettyItemDelegate.cpp
+@@ -460,7 +460,7 @@ void Playlist::PrettyItemDelegate::paint
+                 else
+                     ratingAlignment = Qt::AlignCenter;
+ 
+-                Amarok::KRatingPainter::paintRating( painter, QRect( currentItemX, rowOffsetY, itemWidth, rowHeight ), ratingAlignment, rating, rating );
++                KRatingPainter::paintRating( painter, QRect( currentItemX, rowOffsetY, itemWidth, rowHeight ), ratingAlignment, rating, rating );
+ 
+             }
+             else if ( value == Divider )
diff --git a/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui b/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui
new file mode 100644
index 00000000000..d429f9af9e0
--- /dev/null
+++ b/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui,v 1.1 2012/03/20 10:28:29 markd Exp $
+
+--- src/playlistgenerator/constraints/TagMatchEditWidget.ui.orig	2011-12-15 07:36:48.000000000 +0000
++++ src/playlistgenerator/constraints/TagMatchEditWidget.ui
+@@ -619,7 +619,7 @@ p, li { white-space: pre-wrap; }
+               <item row="0" column="1">
+                <layout class="QHBoxLayout" name="horizontalLayout_3">
+                 <item>
+-                 <widget class="Amarok::KRatingWidget" name="rating_RatingValue">
++                 <widget class="KRatingWidget" name="rating_RatingValue">
+                   <property name="whatsThis">
+                    <string>The rating that the APG should try to match.</string>
+                   </property>