[SCM] Amarok packaging branch, experimental, updated. debian/2.6-beta1-1

Modestas Vainius modax at alioth.debian.org
Sat Jun 2 22:21:36 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=d5244e3

The following commit has been merged in the experimental branch:
commit d5244e3449d8153eb50680b84b8773c4a5a2d6eb
Merge: ba8a03068f828ea53cb117160a265dc92533a02d e3f637c7327182bafea59be796af212050501dee
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 2 23:56:42 2012 +0300

    Merge branch 'master' into experimental

 .reviewboardrc                                     |    1 +
 AUTHORS                                            |    9 +-
 CMakeLists.txt                                     |  121 +-
 ChangeLog                                          |  438 +-
 MAINTAINERS                                        |    3 +
 Mainpage.dox                                       |   46 +
 OXYGEN                                             |   38 -
 README                                             |   53 +-
 cmake/modules/FindFFmpeg.cmake                     |  140 +
 cmake/modules/FindGDKPixBuf.cmake                  |   63 +
 cmake/modules/FindGdk.cmake                        |   49 -
 cmake/modules/FindGooglemock.cmake                 |   16 +-
 cmake/modules/FindHUpnp.cmake                      |   22 +
 cmake/modules/FindLibOFA.cmake                     |   34 +
 cmake/modules/FindLibmygpo-qt.cmake                |   48 +
 cmake/modules/FindMtp.cmake                        |   12 +-
 cmake/modules/FindMySQLAmarok.cmake                |    5 +-
 cmake/modules/FindNjb.cmake                        |   10 +-
 cmake/modules/FindQJSON.cmake                      |   44 +
 config-amarok.h.cmake                              |   26 +-
 debian/README.source                               |    4 +
 debian/amarok-common.install                       |  130 +-
 debian/amarok-doc.install                          |   12 +
 debian/amarok.bug-presubj                          |   24 +-
 debian/amarok.install                              |   17 +-
 debian/amarok.lintian-overrides                    |    3 +
 debian/changelog                                   |  138 +
 debian/compat                                      |    2 +-
 debian/control                                     |   43 +-
 debian/copyright                                   |    4 +-
 ...-tests-for-unprintable-but-also-invalid-c.patch |   74 -
 debian/patches/backport_FLAC_BPM_tags_fix.diff     |   17 -
 .../debian_disable_qtscriptbindings_check_fix.diff |   20 +-
 debian/patches/debian_find_mysql_fix.diff          |   58 +
 debian/patches/debian_fix_doc_nl_build.diff        |   16 +
 .../debian_mysqle_amarok_local_errmsg_feature.diff |   14 +-
 .../patches/debian_mysqle_force_defaults_file.diff |   30 +
 debian/patches/series                              |    6 +-
 ...ream_fix_lyrics_autorefresh_in_some_cases.patch |   29 +
 debian/rules                                       |    7 +-
 debian/source/local-options                        |    2 +
 doc/CMakeLists.txt                                 |    9 +-
 doc/de/index.docbook                               |   28 +-
 doc/en_US/Amarok2-4-1MergeIcon.png                 |  Bin 0 -> 719 bytes
 doc/en_US/Amarok2.1center.png                      |  Bin 20483 -> 0 bytes
 doc/en_US/Amarok2.1contextviewconfig.png           |  Bin 28143 -> 0 bytes
 doc/en_US/Amarok2.1covermanager.png                |  Bin 233653 -> 0 bytes
 doc/en_US/Amarok2.1dynamicplaylist.png             |  Bin 10117 -> 0 bytes
 doc/en_US/Amarok2.1internetservices.png            |  Bin 8648 -> 0 bytes
 doc/en_US/Amarok2.1ipod.png                        |  Bin 8113 -> 0 bytes
 doc/en_US/Amarok2.1left.png                        |  Bin 7050 -> 0 bytes
 doc/en_US/Amarok2.1pleditor.png                    |  Bin 22734 -> 0 bytes
 doc/en_US/Amarok2.1popup.png                       |  Bin 49287 -> 0 bytes
 doc/en_US/Amarok2.1rating.png                      |  Bin 16341 -> 0 bytes
 doc/en_US/Amarok2.1right.png                       |  Bin 17497 -> 0 bytes
 doc/en_US/Amarok2.1scriptmanager.png               |  Bin 26798 -> 0 bytes
 doc/en_US/Amarok2.1svn965006.png                   |  Bin 55217 -> 0 bytes
 doc/en_US/Amarok2WrenchIcon.png                    |  Bin 0 -> 1312 bytes
 doc/en_US/Face-smile.png                           |  Bin 0 -> 1307 bytes
 doc/en_US/Icon-application-exit.png                |  Bin 0 -> 842 bytes
 doc/en_US/Icon-bookmark-new-list.png               |  Bin 0 -> 1100 bytes
 doc/en_US/Icon-configure.png                       |  Bin 0 -> 717 bytes
 doc/en_US/Icon-dialog-information.png              |  Bin 0 -> 993 bytes
 doc/en_US/Icon-document-save.png                   |  Bin 0 -> 798 bytes
 doc/en_US/Icon-edit-clear-locationbar-rtl.png      |  Bin 0 -> 742 bytes
 doc/en_US/Icon-emblem-favorite.png                 |  Bin 0 -> 1993 bytes
 doc/en_US/Icon-flag-green.png                      |  Bin 0 -> 1857 bytes
 doc/en_US/Icon-folder-new.png                      |  Bin 0 -> 729 bytes
 doc/en_US/Icon-folder-remote.png                   |  Bin 0 -> 824 bytes
 doc/en_US/Icon-go-down.png                         |  Bin 0 -> 788 bytes
 doc/en_US/Icon-go-home.png                         |  Bin 0 -> 731 bytes
 doc/en_US/Icon-go-next.png                         |  Bin 0 -> 797 bytes
 doc/en_US/Icon-go-previous.png                     |  Bin 0 -> 746 bytes
 doc/en_US/Icon-go-up.png                           |  Bin 0 -> 817 bytes
 doc/en_US/Icon-list-add.png                        |  Bin 0 -> 564 bytes
 doc/en_US/Icon-media-playback-pause.png            |  Bin 0 -> 607 bytes
 doc/en_US/Icon-media-playback-start.png            |  Bin 0 -> 619 bytes
 doc/en_US/Icon-media-playback-stop.png             |  Bin 0 -> 619 bytes
 doc/en_US/Icon-view-refresh.png                    |  Bin 0 -> 1250 bytes
 doc/en_US/advancedtok.png                          |  Bin 0 -> 3697 bytes
 doc/en_US/amarok-context.png                       |  Bin 0 -> 85950 bytes
 doc/en_US/amarok-contextadd.png                    |  Bin 0 -> 111383 bytes
 doc/en_US/amarok-e17.png                           |  Bin 0 -> 134027 bytes
 doc/en_US/amarok-fluxbox.png                       |  Bin 0 -> 164449 bytes
 doc/en_US/amarok-gnome.png                         |  Bin 0 -> 245162 bytes
 doc/en_US/amarok-lxde.png                          |  Bin 0 -> 221820 bytes
 doc/en_US/amarok-mac-port-install.png              |  Bin 0 -> 37815 bytes
 doc/en_US/amarok-maintoolbar.png                   |  Bin 0 -> 14672 bytes
 doc/en_US/amarok-managing-media.png                |  Bin 0 -> 71658 bytes
 doc/en_US/amarok-merge-icon.png                    |  Bin 0 -> 545 bytes
 doc/en_US/amarok-newdynamic-detail.png             |  Bin 0 -> 40986 bytes
 doc/en_US/amarok-newdynamic.png                    |  Bin 0 -> 223587 bytes
 doc/en_US/amarok-renameplaylist.png                |  Bin 0 -> 37231 bytes
 doc/en_US/amarok-slimtoolbar.png                   |  Bin 0 -> 5455 bytes
 doc/en_US/amarok-xfce.png                          |  Bin 0 -> 156984 bytes
 doc/en_US/amarok.txt                               |   61 +
 doc/en_US/amarok2-4-1albumtageditdialog.png        |  Bin 0 -> 42843 bytes
 .../amarok2-4-1albumtageditpertrackdialog.png      |  Bin 0 -> 45188 bytes
 doc/en_US/amarok2-4-1configplayback.png            |  Bin 0 -> 51718 bytes
 doc/en_US/amarok2-4-1configscripts.png             |  Bin 0 -> 115415 bytes
 doc/en_US/amarok2-4-1configspeakersetup.png        |  Bin 0 -> 99149 bytes
 doc/en_US/amarok2-4-1configuredialog.png           |  Bin 0 -> 59989 bytes
 doc/en_US/amarok2-4-1configuredialogcollection.png |  Bin 0 -> 65681 bytes
 doc/en_US/amarok2-4-1configuredialogplugins.png    |  Bin 0 -> 123901 bytes
 doc/en_US/amarok2-4-1databaseconfig.png            |  Bin 0 -> 64075 bytes
 doc/en_US/amarok2-4-1editfilterdialog.png          |  Bin 0 -> 37670 bytes
 .../amarok2-4-1filenamelayoutchooseroptions.png    |  Bin 0 -> 12589 bytes
 doc/en_US/amarok2-4-1mergedviewcollection.png      |  Bin 0 -> 26699 bytes
 doc/en_US/amarok2-4-1non-mergedviewcollection.png  |  Bin 0 -> 25374 bytes
 doc/en_US/amarok2-4-1notifications.png             |  Bin 0 -> 53843 bytes
 doc/en_US/amarok2-4-1phononbackends.png            |  Bin 0 -> 54489 bytes
 doc/en_US/amarok2-4-1phonondevices.png             |  Bin 0 -> 63269 bytes
 doc/en_US/amarok2-4-1saveplaylistchoices.png       |  Bin 0 -> 11120 bytes
 doc/en_US/amarok2-4-1tageditdialog.png             |  Bin 0 -> 44461 bytes
 doc/en_US/amarok2-4-1viewmenu.png                  |  Bin 0 -> 7454 bytes
 doc/en_US/amarok2-4-playlistsearchfilter.png       |  Bin 0 -> 8556 bytes
 doc/en_US/amarok2-4.png                            |  Bin 0 -> 251280 bytes
 doc/en_US/amarok2-4collectionsortingmenu.png       |  Bin 0 -> 53494 bytes
 doc/en_US/amarok2-4helpmenu.png                    |  Bin 0 -> 20450 bytes
 doc/en_US/amarok2-4musicbrainztagger.png           |  Bin 0 -> 44726 bytes
 doc/en_US/amarok2-4organizefilesadvanceddialog.png |  Bin 0 -> 15711 bytes
 doc/en_US/amarok2-4organizefilesbasicdialog.png    |  Bin 0 -> 107770 bytes
 doc/en_US/amarok2-4queueeditor.png                 |  Bin 0 -> 26516 bytes
 doc/en_US/amarok2-4searchplaylist.png              |  Bin 0 -> 6074 bytes
 doc/en_US/amarok2-4transcodetracksdialog.png       |  Bin 0 -> 44466 bytes
 doc/en_US/amarok24_configureshortcutdetail.png     |  Bin 0 -> 10127 bytes
 doc/en_US/amarok24_configureshortcutsdialog.png    |  Bin 0 -> 68653 bytes
 doc/en_US/amarok24_settingsmenu.png                |  Bin 0 -> 9141 bytes
 doc/en_US/amarok24_settingsmenu_withreplaygain.png |  Bin 0 -> 13576 bytes
 doc/en_US/amarok24_toolsmenu_withtwoscripts.png    |  Bin 0 -> 13484 bytes
 doc/en_US/amarok2_moodbar.png                      |  Bin 0 -> 54702 bytes
 doc/en_US/amarok_add-on_installer.png              |  Bin 0 -> 63513 bytes
 doc/en_US/amarok_addtoplaylist.png                 |  Bin 0 -> 309573 bytes
 doc/en_US/amarok_addtoplaylist1.png                |  Bin 0 -> 48826 bytes
 doc/en_US/amarok_amarokmenu2-4.png                 |  Bin 0 -> 19505 bytes
 doc/en_US/amarok_connecting_media_devices.png      |  Bin 0 -> 18290 bytes
 doc/en_US/amarok_cover_manager.png                 |  Bin 0 -> 218474 bytes
 doc/en_US/amarok_cover_manager_newcover.png        |  Bin 0 -> 301112 bytes
 doc/en_US/amarok_dynamic_playlist.png              |  Bin 0 -> 183876 bytes
 doc/en_US/amarok_layout11.png                      |  Bin 0 -> 116734 bytes
 doc/en_US/amarok_layout22.png                      |  Bin 0 -> 148766 bytes
 doc/en_US/amarok_layout23.png                      |  Bin 0 -> 177692 bytes
 doc/en_US/amarok_layout24.png                      |  Bin 0 -> 218221 bytes
 doc/en_US/amarok_layout25.png                      |  Bin 0 -> 174064 bytes
 doc/en_US/amarok_layout26.png                      |  Bin 0 -> 87228 bytes
 doc/en_US/amarok_layout27.png                      |  Bin 0 -> 110819 bytes
 doc/en_US/amarok_layout28.png                      |  Bin 0 -> 62911 bytes
 doc/en_US/amarok_loading_media_devices.png         |  Bin 0 -> 21523 bytes
 doc/en_US/amarok_main_toolbar.png                  |  Bin 0 -> 13291 bytes
 doc/en_US/amarok_media_devices.png                 |  Bin 0 -> 34411 bytes
 doc/en_US/amarok_on_mac.png                        |  Bin 0 -> 164620 bytes
 doc/en_US/amarok_playlist.png                      |  Bin 0 -> 80479 bytes
 doc/en_US/amarok_playlist_bookmarking.png          |  Bin 0 -> 9963 bytes
 doc/en_US/amarok_playlist_contextmenu.png          |  Bin 0 -> 12342 bytes
 doc/en_US/amarok_playlist_functions.png            |  Bin 0 -> 6076 bytes
 doc/en_US/amarok_playlist_layout_d.png             |  Bin 0 -> 25104 bytes
 doc/en_US/amarok_playlist_layout_d_ss.png          |  Bin 0 -> 39325 bytes
 doc/en_US/amarok_playlist_layout_editor.png        |  Bin 0 -> 68225 bytes
 doc/en_US/amarok_playlist_layout_nog1.png          |  Bin 0 -> 15433 bytes
 doc/en_US/amarok_playlist_layout_nog1_s.png        |  Bin 0 -> 45381 bytes
 doc/en_US/amarok_playlist_layout_nog2.png          |  Bin 0 -> 15480 bytes
 doc/en_US/amarok_playlist_layout_nog2_s.png        |  Bin 0 -> 30021 bytes
 doc/en_US/amarok_playlist_layout_v.png             |  Bin 0 -> 15600 bytes
 doc/en_US/amarok_playlist_layout_v1_s.png          |  Bin 0 -> 59077 bytes
 doc/en_US/amarok_playlist_manipulation.png         |  Bin 0 -> 48014 bytes
 doc/en_US/amarok_playlist_search2.png              |  Bin 0 -> 82721 bytes
 doc/en_US/amarok_playlist_search_ex.png            |  Bin 0 -> 20412 bytes
 doc/en_US/amarok_playlist_sortingleavel.png        |  Bin 0 -> 19613 bytes
 doc/en_US/amarok_removeformplaylist.png            |  Bin 0 -> 247020 bytes
 doc/en_US/amarok_saved_playlists.png               |  Bin 0 -> 47482 bytes
 doc/en_US/amarok_script_info.png                   |  Bin 0 -> 20125 bytes
 doc/en_US/amarok_script_manager.png                |  Bin 0 -> 93143 bytes
 doc/en_US/amarok_show_only_matches.png             |  Bin 0 -> 7706 bytes
 doc/en_US/amarok_slim_toolbar.png                  |  Bin 0 -> 8737 bytes
 doc/en_US/amarok_tracks_media_devices1.png         |  Bin 0 -> 53302 bytes
 doc/en_US/amarok_windowlayout.png                  |  Bin 0 -> 229025 bytes
 doc/en_US/amarokbreadcrumb.png                     |  Bin 0 -> 11615 bytes
 doc/en_US/amarokmediasources-files.png             |  Bin 0 -> 17328 bytes
 doc/en_US/amarokmediasources-home.png              |  Bin 0 -> 27699 bytes
 doc/en_US/amaroknew2-4.png                         |  Bin 0 -> 100592 bytes
 doc/en_US/amarokrightmenu.png                      |  Bin 0 -> 16616 bytes
 doc/en_US/amarokripcd.png                          |  Bin 0 -> 44325 bytes
 doc/en_US/amaroksystray.png                        |  Bin 0 -> 9546 bytes
 doc/en_US/amaroktoplevelmenus2-4.png               |  Bin 0 -> 8679 bytes
 doc/en_US/amarokwindow_context.png                 |  Bin 0 -> 86845 bytes
 doc/en_US/amarokwindow_mediasources.png            |  Bin 0 -> 61354 bytes
 doc/en_US/amarokwindow_playlist.png                |  Bin 0 -> 64239 bytes
 doc/en_US/apgpresetsmatchallgroup.png              |  Bin 0 -> 39180 bytes
 doc/en_US/applications-internet.png                |  Bin 0 -> 5276 bytes
 doc/en_US/cd_collection_sansa.png                  |  Bin 0 -> 69799 bytes
 doc/en_US/configure_amarok.png                     |  Bin 0 -> 53401 bytes
 doc/en_US/contextpane.png                          |  Bin 0 -> 225481 bytes
 doc/en_US/contextpanestopped.png                   |  Bin 0 -> 119676 bytes
 doc/en_US/controlamarok.png                        |  Bin 0 -> 16747 bytes
 doc/en_US/document-new.png                         |  Bin 0 -> 2937 bytes
 doc/en_US/document-save.png                        |  Bin 0 -> 2278 bytes
 doc/en_US/dynamic_playlist.png                     |  Bin 0 -> 26292 bytes
 doc/en_US/edit-copy.png                            |  Bin 0 -> 1773 bytes
 doc/en_US/edit-redo.png                            |  Bin 0 -> 3587 bytes
 doc/en_US/edit-undo.png                            |  Bin 0 -> 3621 bytes
 doc/en_US/favor-menu.png                           |  Bin 0 -> 2091 bytes
 doc/en_US/firstruncollection2.png                  |  Bin 0 -> 28064 bytes
 doc/en_US/folder-amarok.png                        |  Bin 0 -> 1370 bytes
 doc/en_US/generatedlist.png                        |  Bin 0 -> 231006 bytes
 doc/en_US/generatingtree.png                       |  Bin 0 -> 125711 bytes
 doc/en_US/hi32-action-collection-amarok.png        |  Bin 0 -> 2220 bytes
 doc/en_US/hi48-action-clear-playlist-amarok.png    |  Bin 0 -> 3477 bytes
 doc/en_US/hi48-action-edit-playlist-queue.png      |  Bin 0 -> 1040 bytes
 ...ion-media-standard-track-progression-amarok.png |  Bin 0 -> 3154 bytes
 doc/en_US/hi48-action-music-amarok.png             |  Bin 0 -> 3048 bytes
 doc/en_US/hi48-action-podcast-amarok.png           |  Bin 0 -> 4416 bytes
 doc/en_US/index.docbook                            | 7911 ++++++-
 doc/en_US/installation1-1.png                      |  Bin 0 -> 14898 bytes
 doc/en_US/installation2.png                        |  Bin 0 -> 13147 bytes
 doc/en_US/installation3.png                        |  Bin 0 -> 11368 bytes
 doc/en_US/installation4.png                        |  Bin 0 -> 11315 bytes
 doc/en_US/lowerpart.png                            |  Bin 0 -> 19056 bytes
 doc/en_US/media_sources1.png                       |  Bin 0 -> 28168 bytes
 doc/en_US/media_sources3.png                       |  Bin 0 -> 13344 bytes
 doc/en_US/mediasources.png                         |  Bin 0 -> 34004 bytes
 doc/en_US/mediasources10.png                       |  Bin 0 -> 10220 bytes
 doc/en_US/mediasources5.png                        |  Bin 0 -> 24486 bytes
 doc/en_US/mediasources6.png                        |  Bin 0 -> 34364 bytes
 doc/en_US/mediasources7.png                        |  Bin 0 -> 21711 bytes
 doc/en_US/mediasources8.png                        |  Bin 0 -> 10853 bytes
 doc/en_US/mediasourcesex.png                       |  Bin 0 -> 15069 bytes
 doc/en_US/menuitems.png                            |  Bin 0 -> 7023 bytes
 doc/en_US/nocover_amarok.png                       |  Bin 0 -> 3804 bytes
 doc/en_US/oraganize_menu.png                       |  Bin 0 -> 22968 bytes
 doc/en_US/otherplatforms_nonkde.png                |  Bin 0 -> 5941 bytes
 doc/en_US/otherplatforms_osx.png                   |  Bin 0 -> 7950 bytes
 doc/en_US/otherplatforms_windows.png               |  Bin 0 -> 7104 bytes
 doc/en_US/playlist-album-menu.png                  |  Bin 0 -> 5045 bytes
 doc/en_US/playlist-layout-editor-amarok.png        |  Bin 0 -> 77805 bytes
 .../playlist-layout-item-configuration-amarok.png  |  Bin 0 -> 25276 bytes
 doc/en_US/playlist-ordering.png                    |  Bin 0 -> 3261 bytes
 doc/en_US/playlist.png                             |  Bin 0 -> 14341 bytes
 doc/en_US/playlist_save_icon_amarok.png            |  Bin 0 -> 1400 bytes
 doc/en_US/preferences-other.png                    |  Bin 0 -> 48312 bytes
 doc/en_US/queue_example11.png                      |  Bin 0 -> 41554 bytes
 doc/en_US/queue_example12.png                      |  Bin 0 -> 43778 bytes
 doc/en_US/queue_example_2.png                      |  Bin 0 -> 73016 bytes
 doc/en_US/queue_example_4.png                      |  Bin 0 -> 26882 bytes
 doc/en_US/remotecollections_ampache_client.png     |  Bin 0 -> 63676 bytes
 doc/en_US/remotecollections_ampache_client1.png    |  Bin 0 -> 20485 bytes
 doc/en_US/remotecollections_ampache_client2.png    |  Bin 0 -> 50901 bytes
 doc/en_US/remotecollections_client.png             |  Bin 0 -> 54776 bytes
 doc/en_US/remotecollections_daap.png               |  Bin 0 -> 20468 bytes
 doc/en_US/remotecollections_daap_config.png        |  Bin 0 -> 42471 bytes
 doc/en_US/remotecollections_samba_server.png       |  Bin 0 -> 25597 bytes
 doc/en_US/remotecollections_samba_server1.png      |  Bin 0 -> 123755 bytes
 doc/en_US/remotecollections_samba_server2.png      |  Bin 0 -> 24238 bytes
 doc/en_US/remotecollections_samba_server3.png      |  Bin 0 -> 36703 bytes
 doc/en_US/repeat-menu.png                          |  Bin 0 -> 5980 bytes
 doc/en_US/save-playlist-menu.png                   |  Bin 0 -> 2856 bytes
 doc/en_US/searchincollection.png                   |  Bin 0 -> 13931 bytes
 doc/en_US/searchincollection_example_editbox.png   |  Bin 0 -> 50212 bytes
 doc/en_US/searchincollection_example_editbox2.png  |  Bin 0 -> 23991 bytes
 doc/en_US/settings-internet-amarok.png             |  Bin 0 -> 79114 bytes
 doc/en_US/tagedit_fromfile_advanced.png            |  Bin 0 -> 44635 bytes
 doc/en_US/tagedit_fromfile_advanced_example.png    |  Bin 0 -> 45899 bytes
 doc/en_US/tagedit_fromfile_basic.png               |  Bin 0 -> 66170 bytes
 doc/en_US/tagedit_fromfile_basic_example.png       |  Bin 0 -> 69385 bytes
 doc/en_US/toolbar_main.png                         |  Bin 0 -> 19535 bytes
 doc/en_US/toolbar_slim.png                         |  Bin 0 -> 10177 bytes
 doc/en_US/tools_bookmarkmanager.png                |  Bin 0 -> 37319 bytes
 doc/en_US/tools_covermanager.png                   |  Bin 0 -> 332667 bytes
 doc/en_US/tools_equalizer.png                      |  Bin 0 -> 16949 bytes
 doc/en_US/tools_scriptmanager.png                  |  Bin 0 -> 43526 bytes
 doc/en_US/transcode_1.png                          |  Bin 0 -> 45901 bytes
 doc/en_US/view-media-playlist.png                  |  Bin 0 -> 1834 bytes
 doc/es/advanced.docbook                            | 1636 --
 doc/es/config.docbook                              |  555 -
 doc/es/faq.docbook                                 | 1332 --
 doc/es/index.docbook                               | 1770 ++-
 doc/es/quick.docbook                               |  148 -
 doc/es/requirements.docbook                        |  136 -
 doc/es/using.docbook                               | 2126 --
 doc/et/CMakeLists.txt                              |    1 +
 doc/et/index.docbook                               | 1983 ++
 doc/nl/CMakeLists.txt                              |    1 +
 doc/nl/add_dynamic.png                             |  Bin 0 -> 54799 bytes
 doc/nl/amarok_playlist.png                         |  Bin 0 -> 219736 bytes
 doc/nl/analyzer.png                                |  Bin 0 -> 7181 bytes
 doc/nl/buttons.png                                 |  Bin 0 -> 6682 bytes
 doc/nl/collection.png                              |  Bin 0 -> 41672 bytes
 doc/nl/config_appearance.png                       |  Bin 0 -> 86442 bytes
 doc/nl/config_collection.png                       |  Bin 0 -> 82603 bytes
 doc/nl/config_engine.png                           |  Bin 0 -> 93689 bytes
 doc/nl/config_general.png                          |  Bin 0 -> 94943 bytes
 doc/nl/config_osd.png                              |  Bin 0 -> 82774 bytes
 doc/nl/config_playback.png                         |  Bin 0 -> 66760 bytes
 doc/nl/config_scrobbler.png                        |  Bin 0 -> 97021 bytes
 doc/nl/context.png                                 |  Bin 0 -> 19174 bytes
 doc/nl/coverman.png                                |  Bin 0 -> 197793 bytes
 doc/nl/dynamic_bar.png                             |  Bin 0 -> 14355 bytes
 doc/nl/dynamic_settings.png                        |  Bin 0 -> 23936 bytes
 doc/nl/equalizer.png                               |  Bin 0 -> 22149 bytes
 doc/nl/file_browser.png                            |  Bin 0 -> 44719 bytes
 doc/nl/index.docbook                               |13970 +++++++++++
 doc/nl/logo.png                                    |  Bin 0 -> 3554 bytes
 doc/nl/media_device.png                            |  Bin 0 -> 27339 bytes
 doc/nl/menubar.png                                 |  Bin 0 -> 2936 bytes
 doc/nl/musicbrainz.png                             |  Bin 0 -> 1611 bytes
 doc/nl/pl_browser.png                              |  Bin 0 -> 15534 bytes
 doc/nl/pl_tip1.png                                 |  Bin 0 -> 14540 bytes
 doc/nl/play_list.png                               |  Bin 0 -> 30197 bytes
 doc/nl/player_window.png                           |  Bin 0 -> 8727 bytes
 doc/nl/playlist_browser.png                        |  Bin 0 -> 54507 bytes
 doc/nl/playlist_window.png                         |  Bin 0 -> 94797 bytes
 doc/nl/queue_manager.png                           |  Bin 0 -> 16054 bytes
 doc/nl/rmb_menu.png                                |  Bin 0 -> 50338 bytes
 doc/nl/script_manager.png                          |  Bin 0 -> 38015 bytes
 doc/nl/status_bar.png                              |  Bin 0 -> 7441 bytes
 doc/nl/tab_lyrics.png                              |  Bin 0 -> 35244 bytes
 doc/nl/tab_lyrics1.png                             |  Bin 0 -> 22797 bytes
 doc/nl/tab_music.png                               |  Bin 0 -> 79393 bytes
 doc/nl/tab_wiki.png                                |  Bin 0 -> 106875 bytes
 doc/nl/vis_window.png                              |  Bin 0 -> 16022 bytes
 doc/pt/index.docbook                               |14176 +++++++++++-
 doc/pt_BR/advanced.docbook                         | 1639 --
 doc/pt_BR/config.docbook                           |  555 -
 doc/pt_BR/faq.docbook                              | 1340 --
 doc/pt_BR/index.docbook                            | 2447 ++-
 doc/pt_BR/quick.docbook                            |  146 -
 doc/pt_BR/requirements.docbook                     |  136 -
 doc/pt_BR/using.docbook                            | 2152 --
 doc/ru/CMakeLists.txt                              |    1 +
 doc/ru/advancedtok.png                             |  Bin 0 -> 4102 bytes
 doc/ru/amarok-context.png                          |  Bin 0 -> 87649 bytes
 doc/ru/amarok-contextadd.png                       |  Bin 0 -> 116483 bytes
 doc/ru/amarok-maintoolbar.png                      |  Bin 0 -> 11044 bytes
 doc/ru/amarok-managing-media.png                   |  Bin 0 -> 68614 bytes
 doc/ru/amarok-managing-media1.png                  |  Bin 0 -> 118116 bytes
 doc/ru/amarok-renameplaylist.png                   |  Bin 0 -> 59038 bytes
 doc/ru/amarok-slimtoolbar.png                      |  Bin 0 -> 6572 bytes
 doc/ru/amarok2-4-1albumtageditdialog.png           |  Bin 0 -> 57347 bytes
 doc/ru/amarok2-4-1albumtageditpertrackdialog.png   |  Bin 0 -> 63221 bytes
 doc/ru/amarok2-4-1configplayback.png               |  Bin 0 -> 80196 bytes
 doc/ru/amarok2-4-1configscripts.png                |  Bin 0 -> 116894 bytes
 doc/ru/amarok2-4-1configspeakersetup.png           |  Bin 0 -> 90035 bytes
 doc/ru/amarok2-4-1configuredialog.png              |  Bin 0 -> 102833 bytes
 doc/ru/amarok2-4-1configuredialogcollection.png    |  Bin 0 -> 111013 bytes
 doc/ru/amarok2-4-1configuredialogplugins.png       |  Bin 0 -> 208325 bytes
 doc/ru/amarok2-4-1databaseconfig.png               |  Bin 0 -> 124177 bytes
 doc/ru/amarok2-4-1editfilterdialog.png             |  Bin 0 -> 38603 bytes
 doc/ru/amarok2-4-1filenamelayoutchooseroptions.png |  Bin 0 -> 20629 bytes
 doc/ru/amarok2-4-1mergedviewcollection.png         |  Bin 0 -> 35519 bytes
 doc/ru/amarok2-4-1non-mergedviewcollection.png     |  Bin 0 -> 37680 bytes
 doc/ru/amarok2-4-1notifications.png                |  Bin 0 -> 91729 bytes
 doc/ru/amarok2-4-1phononbackends.png               |  Bin 0 -> 62612 bytes
 doc/ru/amarok2-4-1phonondevices.png                |  Bin 0 -> 98393 bytes
 doc/ru/amarok2-4-1saveplaylistchoices.png          |  Bin 0 -> 18707 bytes
 doc/ru/amarok2-4-1tageditdialog.png                |  Bin 0 -> 59545 bytes
 doc/ru/amarok2-4-1viewmenu.png                     |  Bin 0 -> 11672 bytes
 doc/ru/amarok2-4-playlistsearchfilter.png          |  Bin 0 -> 16201 bytes
 doc/ru/amarok2-4collectionsortingmenu.png          |  Bin 0 -> 97980 bytes
 doc/ru/amarok2-4helpmenu.png                       |  Bin 0 -> 20883 bytes
 doc/ru/amarok2-4musicbrainztagger.png              |  Bin 0 -> 66832 bytes
 doc/ru/amarok2-4organizefilesadvanceddialog.png    |  Bin 0 -> 20554 bytes
 doc/ru/amarok2-4organizefilesbasicdialog.png       |  Bin 0 -> 94972 bytes
 doc/ru/amarok2-4searchplaylist.png                 |  Bin 0 -> 8712 bytes
 doc/ru/amarok24_configureshortcutdetail.png        |  Bin 0 -> 10522 bytes
 doc/ru/amarok24_configureshortcutsdialog.png       |  Bin 0 -> 99744 bytes
 doc/ru/amarok24_settingsmenu.png                   |  Bin 0 -> 12518 bytes
 doc/ru/amarok24_settingsmenu_withreplaygain.png    |  Bin 0 -> 21656 bytes
 doc/ru/amarok24_toolsmenu_withtwoscripts.png       |  Bin 0 -> 13129 bytes
 doc/ru/amarok2_moodbar.png                         |  Bin 0 -> 69200 bytes
 doc/ru/amarok3_moodbar.png                         |  Bin 0 -> 69200 bytes
 doc/ru/amarok_add-on_installer.png                 |  Bin 0 -> 95723 bytes
 doc/ru/amarok_addtoplaylist.png                    |  Bin 0 -> 263195 bytes
 doc/ru/amarok_addtoplaylist1.png                   |  Bin 0 -> 70154 bytes
 doc/ru/amarok_amarokmenu2-4.png                    |  Bin 0 -> 26364 bytes
 doc/ru/amarok_connecting_media_devices.png         |  Bin 0 -> 18657 bytes
 doc/ru/amarok_cover_manager_newcover.png           |  Bin 0 -> 88437 bytes
 doc/ru/amarok_layout11.png                         |  Bin 0 -> 82329 bytes
 doc/ru/amarok_layout22.png                         |  Bin 0 -> 124705 bytes
 doc/ru/amarok_layout23.png                         |  Bin 0 -> 201624 bytes
 doc/ru/amarok_layout24.png                         |  Bin 0 -> 244494 bytes
 doc/ru/amarok_layout25.png                         |  Bin 0 -> 191456 bytes
 doc/ru/amarok_layout26.png                         |  Bin 0 -> 155376 bytes
 doc/ru/amarok_layout27.png                         |  Bin 0 -> 192138 bytes
 doc/ru/amarok_layout28.png                         |  Bin 0 -> 56957 bytes
 doc/ru/amarok_loading_media_devices.png            |  Bin 0 -> 20816 bytes
 doc/ru/amarok_main_toolbar.png                     |  Bin 0 -> 13656 bytes
 doc/ru/amarok_media_devices.png                    |  Bin 0 -> 35590 bytes
 doc/ru/amarok_playlist.png                         |  Bin 0 -> 97380 bytes
 doc/ru/amarok_playlist_contextmenu.png             |  Bin 0 -> 15774 bytes
 doc/ru/amarok_playlist_layout_d.png                |  Bin 0 -> 64997 bytes
 doc/ru/amarok_playlist_layout_d_ss.png             |  Bin 0 -> 60695 bytes
 doc/ru/amarok_playlist_layout_editor.png           |  Bin 0 -> 97419 bytes
 doc/ru/amarok_playlist_layout_nog1.png             |  Bin 0 -> 69940 bytes
 doc/ru/amarok_playlist_layout_nog1_s.png           |  Bin 0 -> 129902 bytes
 doc/ru/amarok_playlist_layout_nog2.png             |  Bin 0 -> 61949 bytes
 doc/ru/amarok_playlist_layout_nog2_s.png           |  Bin 0 -> 74848 bytes
 doc/ru/amarok_playlist_layout_v.png                |  Bin 0 -> 62067 bytes
 doc/ru/amarok_playlist_layout_v1_s.png             |  Bin 0 -> 79185 bytes
 doc/ru/amarok_playlist_manipulation.png            |  Bin 0 -> 74051 bytes
 doc/ru/amarok_playlist_search2.png                 |  Bin 0 -> 82883 bytes
 doc/ru/amarok_playlist_search_ex.png               |  Bin 0 -> 37465 bytes
 doc/ru/amarok_playlist_sortingleavel.png           |  Bin 0 -> 25073 bytes
 doc/ru/amarok_removeformplaylist.png               |  Bin 0 -> 258529 bytes
 doc/ru/amarok_saved_playlists.png                  |  Bin 0 -> 50414 bytes
 doc/ru/amarok_script_info.png                      |  Bin 0 -> 31729 bytes
 doc/ru/amarok_show_only_matches.png                |  Bin 0 -> 10837 bytes
 doc/ru/amarok_slim_toolbar.png                     |  Bin 0 -> 6471 bytes
 doc/ru/amarok_tracks_media_devices1.png            |  Bin 0 -> 13874 bytes
 doc/ru/amarok_windowlayout.png                     |  Bin 0 -> 177766 bytes
 doc/ru/amarokbreadcrumb.png                        |  Bin 0 -> 9766 bytes
 doc/ru/amarokmediasources-files.png                |  Bin 0 -> 30951 bytes
 doc/ru/amarokmediasources-home.png                 |  Bin 0 -> 30951 bytes
 doc/ru/amaroknew2-4.png                            |  Bin 0 -> 75270 bytes
 doc/ru/amarokrightmenu.png                         |  Bin 0 -> 24583 bytes
 doc/ru/amaroktoplevelmenus2-4.png                  |  Bin 0 -> 8087 bytes
 doc/ru/amarokwindow_context.png                    |  Bin 0 -> 84902 bytes
 doc/ru/amarokwindow_mediasources.png               |  Bin 0 -> 72261 bytes
 doc/ru/amarokwindow_playlist.png                   |  Bin 0 -> 81994 bytes
 doc/ru/apgpresetsmatchallgroup.png                 |  Bin 0 -> 42890 bytes
 doc/ru/contextpane.png                             |  Bin 0 -> 84902 bytes
 doc/ru/contextpanestopped.png                      |  Bin 0 -> 32858 bytes
 doc/ru/controlamarok.png                           |  Bin 0 -> 14037 bytes
 doc/ru/dynamic_playlist.png                        |  Bin 0 -> 37956 bytes
 doc/ru/favor-menu.png                              |  Bin 0 -> 8156 bytes
 doc/ru/index.docbook                               |14108 +++++++++++
 doc/ru/lowerpart.png                               |  Bin 0 -> 7560 bytes
 doc/ru/media_sources1.png                          |  Bin 0 -> 30247 bytes
 doc/ru/media_sources3.png                          |  Bin 0 -> 12699 bytes
 doc/ru/mediasources10.png                          |  Bin 0 -> 6348 bytes
 doc/ru/mediasources5.png                           |  Bin 0 -> 19053 bytes
 doc/ru/mediasources6.png                           |  Bin 0 -> 32661 bytes
 doc/ru/mediasources7.png                           |  Bin 0 -> 16149 bytes
 doc/ru/mediasources8.png                           |  Bin 0 -> 11299 bytes
 doc/ru/mediasourcesex.png                          |  Bin 0 -> 13811 bytes
 doc/ru/oraganize_menu.png                          |  Bin 0 -> 62615 bytes
 doc/ru/playlist-album-menu.png                     |  Bin 0 -> 13528 bytes
 doc/ru/playlist-layout-editor-amarok.png           |  Bin 0 -> 101968 bytes
 .../playlist-layout-item-configuration-amarok.png  |  Bin 0 -> 37120 bytes
 doc/ru/playlist-ordering.png                       |  Bin 0 -> 6349 bytes
 doc/ru/playlist.png                                |  Bin 0 -> 24308 bytes
 doc/ru/queue_example11.png                         |  Bin 0 -> 41734 bytes
 doc/ru/queue_example12.png                         |  Bin 0 -> 40227 bytes
 doc/ru/queue_example_2.png                         |  Bin 0 -> 58713 bytes
 doc/ru/queue_example_4.png                         |  Bin 0 -> 14442 bytes
 doc/ru/remotecollections_ampache_client1.png       |  Bin 0 -> 17899 bytes
 doc/ru/remotecollections_client.png                |  Bin 0 -> 85542 bytes
 doc/ru/remotecollections_samba_server.png          |  Bin 0 -> 36368 bytes
 doc/ru/repeat-menu.png                             |  Bin 0 -> 16151 bytes
 doc/ru/searchincollection.png                      |  Bin 0 -> 21039 bytes
 doc/ru/searchincollection_example_editbox.png      |  Bin 0 -> 106655 bytes
 doc/ru/searchincollection_example_editbox2.png     |  Bin 0 -> 64290 bytes
 doc/ru/tagedit_fromfile_advanced.png               |  Bin 0 -> 72942 bytes
 doc/ru/tagedit_fromfile_basic.png                  |  Bin 0 -> 90860 bytes
 doc/ru/toolbar_main.png                            |  Bin 0 -> 13656 bytes
 doc/ru/toolbar_slim.png                            |  Bin 0 -> 9645 bytes
 doc/ru/tools_bookmarkmanager.png                   |  Bin 0 -> 35269 bytes
 doc/ru/tools_covermanager.png                      |  Bin 0 -> 204482 bytes
 doc/ru/tools_equalizer.png                         |  Bin 0 -> 30819 bytes
 doc/ru/tools_scriptmanager.png                     |  Bin 0 -> 88595 bytes
 doc/sv/advanced.docbook                            | 1637 --
 doc/sv/config.docbook                              |  555 -
 doc/sv/faq.docbook                                 | 1350 --
 doc/sv/index.docbook                               | 1742 ++-
 doc/sv/quick.docbook                               |  148 -
 doc/sv/requirements.docbook                        |  136 -
 doc/sv/using.docbook                               | 2154 --
 doc/uk/Amarok2.1center.png                         |  Bin 26418 -> 0 bytes
 doc/uk/Amarok2.1contextviewconfig.png              |  Bin 34213 -> 0 bytes
 doc/uk/Amarok2.1covermanager.png                   |  Bin 173790 -> 0 bytes
 doc/uk/Amarok2.1dynamicplaylist.png                |  Bin 14936 -> 0 bytes
 doc/uk/Amarok2.1internetservices.png               |  Bin 8975 -> 0 bytes
 doc/uk/Amarok2.1ipod.png                           |  Bin 13298 -> 0 bytes
 doc/uk/Amarok2.1left.png                           |  Bin 10423 -> 0 bytes
 doc/uk/Amarok2.1pleditor.png                       |  Bin 22420 -> 0 bytes
 doc/uk/Amarok2.1popup.png                          |  Bin 86470 -> 0 bytes
 doc/uk/Amarok2.1rating.png                         |  Bin 12131 -> 0 bytes
 doc/uk/Amarok2.1right.png                          |  Bin 30180 -> 0 bytes
 doc/uk/Amarok2.1scriptmanager.png                  |  Bin 20198 -> 0 bytes
 doc/uk/Amarok2.1svn965006.png                      |  Bin 70688 -> 0 bytes
 doc/uk/advancedtok.png                             |  Bin 0 -> 3910 bytes
 doc/uk/amarok-context.png                          |  Bin 0 -> 100959 bytes
 doc/uk/amarok-contextadd.png                       |  Bin 0 -> 129745 bytes
 doc/uk/amarok-maintoolbar.png                      |  Bin 0 -> 30360 bytes
 doc/uk/amarok-managing-media.png                   |  Bin 0 -> 28603 bytes
 doc/uk/amarok-newdynamic-detail.png                |  Bin 0 -> 39541 bytes
 doc/uk/amarok-newdynamic.png                       |  Bin 0 -> 350520 bytes
 doc/uk/amarok-renameplaylist.png                   |  Bin 0 -> 48331 bytes
 doc/uk/amarok-slimtoolbar.png                      |  Bin 0 -> 18218 bytes
 doc/uk/amarok2-4-1albumtageditdialog.png           |  Bin 0 -> 62538 bytes
 doc/uk/amarok2-4-1albumtageditpertrackdialog.png   |  Bin 0 -> 64824 bytes
 doc/uk/amarok2-4-1configplayback.png               |  Bin 0 -> 67325 bytes
 doc/uk/amarok2-4-1configscripts.png                |  Bin 0 -> 113240 bytes
 doc/uk/amarok2-4-1configspeakersetup.png           |  Bin 0 -> 75368 bytes
 doc/uk/amarok2-4-1configuredialog.png              |  Bin 0 -> 83924 bytes
 doc/uk/amarok2-4-1configuredialogcollection.png    |  Bin 0 -> 93447 bytes
 doc/uk/amarok2-4-1configuredialogplugins.png       |  Bin 0 -> 178356 bytes
 doc/uk/amarok2-4-1databaseconfig.png               |  Bin 0 -> 88990 bytes
 doc/uk/amarok2-4-1editfilterdialog.png             |  Bin 0 -> 49998 bytes
 doc/uk/amarok2-4-1filenamelayoutchooseroptions.png |  Bin 0 -> 20643 bytes
 doc/uk/amarok2-4-1mergedviewcollection.png         |  Bin 0 -> 79154 bytes
 doc/uk/amarok2-4-1non-mergedviewcollection.png     |  Bin 0 -> 78719 bytes
 doc/uk/amarok2-4-1notifications.png                |  Bin 0 -> 73240 bytes
 doc/uk/amarok2-4-1phononbackends.png               |  Bin 0 -> 65660 bytes
 doc/uk/amarok2-4-1phonondevices.png                |  Bin 0 -> 106872 bytes
 doc/uk/amarok2-4-1saveplaylistchoices.png          |  Bin 0 -> 17650 bytes
 doc/uk/amarok2-4-1viewmenu.png                     |  Bin 0 -> 14177 bytes
 doc/uk/amarok2-4-playlistsearchfilter.png          |  Bin 0 -> 13008 bytes
 doc/uk/amarok2-4.png                               |  Bin 0 -> 369040 bytes
 doc/uk/amarok2-4collectionsortingmenu.png          |  Bin 0 -> 112300 bytes
 doc/uk/amarok2-4helpmenu.png                       |  Bin 0 -> 18026 bytes
 doc/uk/amarok2-4musicbrainztagger.png              |  Bin 0 -> 62160 bytes
 doc/uk/amarok2-4organizefilesadvanceddialog.png    |  Bin 0 -> 19470 bytes
 doc/uk/amarok2-4organizefilesbasicdialog.png       |  Bin 0 -> 122720 bytes
 doc/uk/amarok2-4searchplaylist.png                 |  Bin 0 -> 6531 bytes
 doc/uk/amarok2-4transcodetracksdialog.png          |  Bin 0 -> 60390 bytes
 doc/uk/amarok24_configureshortcutdetail.png        |  Bin 0 -> 7741 bytes
 doc/uk/amarok24_configureshortcutsdialog.png       |  Bin 0 -> 67714 bytes
 doc/uk/amarok24_settingsmenu.png                   |  Bin 0 -> 12990 bytes
 doc/uk/amarok24_settingsmenu_withreplaygain.png    |  Bin 0 -> 24040 bytes
 doc/uk/amarok24_toolsmenu_withtwoscripts.png       |  Bin 0 -> 18049 bytes
 doc/uk/amarok2_moodbar.png                         |  Bin 0 -> 74643 bytes
 doc/uk/amarok_add-on_installer.png                 |  Bin 0 -> 105710 bytes
 doc/uk/amarok_addtoplaylist.png                    |  Bin 0 -> 341942 bytes
 doc/uk/amarok_addtoplaylist1.png                   |  Bin 0 -> 90803 bytes
 doc/uk/amarok_amarokmenu2-4.png                    |  Bin 0 -> 22648 bytes
 doc/uk/amarok_cover_manager.png                    |  Bin 0 -> 271093 bytes
 doc/uk/amarok_cover_manager_newcover.png           |  Bin 0 -> 299436 bytes
 doc/uk/amarok_layout11.png                         |  Bin 0 -> 154383 bytes
 doc/uk/amarok_layout22.png                         |  Bin 0 -> 184344 bytes
 doc/uk/amarok_layout23.png                         |  Bin 0 -> 240113 bytes
 doc/uk/amarok_layout24.png                         |  Bin 0 -> 237326 bytes
 doc/uk/amarok_layout25.png                         |  Bin 0 -> 244551 bytes
 doc/uk/amarok_layout26.png                         |  Bin 0 -> 164405 bytes
 doc/uk/amarok_layout27.png                         |  Bin 0 -> 198100 bytes
 doc/uk/amarok_layout28.png                         |  Bin 0 -> 99390 bytes
 doc/uk/amarok_main_toolbar.png                     |  Bin 0 -> 25455 bytes
 doc/uk/amarok_playlist.png                         |  Bin 0 -> 143472 bytes
 doc/uk/amarok_playlist_bookmarking.png             |  Bin 0 -> 9064 bytes
 doc/uk/amarok_playlist_contextmenu.png             |  Bin 0 -> 15809 bytes
 doc/uk/amarok_playlist_functions.png               |  Bin 0 -> 6959 bytes
 doc/uk/amarok_playlist_layout_d.png                |  Bin 0 -> 27202 bytes
 doc/uk/amarok_playlist_layout_d_ss.png             |  Bin 0 -> 68146 bytes
 doc/uk/amarok_playlist_layout_editor.png           |  Bin 0 -> 89885 bytes
 doc/uk/amarok_playlist_layout_nog1.png             |  Bin 0 -> 38981 bytes
 doc/uk/amarok_playlist_layout_nog1_s.png           |  Bin 0 -> 67757 bytes
 doc/uk/amarok_playlist_layout_nog2.png             |  Bin 0 -> 38071 bytes
 doc/uk/amarok_playlist_layout_nog2_s.png           |  Bin 0 -> 60437 bytes
 doc/uk/amarok_playlist_layout_v.png                |  Bin 0 -> 39433 bytes
 doc/uk/amarok_playlist_layout_v1_s.png             |  Bin 0 -> 71790 bytes
 doc/uk/amarok_playlist_manipulation.png            |  Bin 0 -> 80870 bytes
 doc/uk/amarok_playlist_search2.png                 |  Bin 0 -> 123927 bytes
 doc/uk/amarok_playlist_search_ex.png               |  Bin 0 -> 53431 bytes
 doc/uk/amarok_playlist_sortingleavel.png           |  Bin 0 -> 31251 bytes
 doc/uk/amarok_removeformplaylist.png               |  Bin 0 -> 336548 bytes
 doc/uk/amarok_saved_playlists.png                  |  Bin 0 -> 47316 bytes
 doc/uk/amarok_script_info.png                      |  Bin 0 -> 42570 bytes
 doc/uk/amarok_show_only_matches.png                |  Bin 0 -> 14142 bytes
 doc/uk/amarok_slim_toolbar.png                     |  Bin 0 -> 18392 bytes
 doc/uk/amarok_tracks_media_devices1.png            |  Bin 0 -> 76105 bytes
 doc/uk/amarok_windowlayout.png                     |  Bin 0 -> 294856 bytes
 doc/uk/amarokbreadcrumb.png                        |  Bin 0 -> 10069 bytes
 doc/uk/amarokmediasources-files.png                |  Bin 0 -> 75537 bytes
 doc/uk/amarokmediasources-home.png                 |  Bin 0 -> 39203 bytes
 doc/uk/amaroknew2-4.png                            |  Bin 0 -> 113913 bytes
 doc/uk/amarokrightmenu.png                         |  Bin 0 -> 13100 bytes
 doc/uk/amarokripcd.png                             |  Bin 0 -> 79428 bytes
 doc/uk/amaroksystray.png                           |  Bin 0 -> 6273 bytes
 doc/uk/amarokwindow_context.png                    |  Bin 0 -> 91146 bytes
 doc/uk/amarokwindow_mediasources.png               |  Bin 0 -> 114354 bytes
 doc/uk/amarokwindow_playlist.png                   |  Bin 0 -> 108373 bytes
 doc/uk/apgpresetsmatchallgroup.png                 |  Bin 0 -> 52103 bytes
 doc/uk/cd_collection_sansa.png                     |  Bin 0 -> 73576 bytes
 doc/uk/contextpane.png                             |  Bin 0 -> 111301 bytes
 doc/uk/contextpanestopped.png                      |  Bin 0 -> 63347 bytes
 doc/uk/controlamarok.png                           |  Bin 0 -> 36915 bytes
 doc/uk/favor-menu.png                              |  Bin 0 -> 6741 bytes
 doc/uk/firstruncollection2.png                     |  Bin 0 -> 29792 bytes
 doc/uk/generatingtree.png                          |  Bin 0 -> 60590 bytes
 doc/uk/index.docbook                               |14081 +++++++++++-
 doc/uk/lowerpart.png                               |  Bin 0 -> 3867 bytes
 doc/uk/media_sources1.png                          |  Bin 0 -> 39197 bytes
 doc/uk/media_sources3.png                          |  Bin 0 -> 16012 bytes
 doc/uk/mediasources.png                            |  Bin 0 -> 96605 bytes
 doc/uk/mediasources10.png                          |  Bin 0 -> 12306 bytes
 doc/uk/mediasources5.png                           |  Bin 0 -> 35376 bytes
 doc/uk/mediasources6.png                           |  Bin 0 -> 61478 bytes
 doc/uk/mediasources7.png                           |  Bin 0 -> 35223 bytes
 doc/uk/mediasources8.png                           |  Bin 0 -> 16318 bytes
 doc/uk/mediasourcesex.png                          |  Bin 0 -> 27540 bytes
 doc/uk/oraganize_menu.png                          |  Bin 0 -> 37939 bytes
 doc/uk/playlist-album-menu.png                     |  Bin 0 -> 11177 bytes
 doc/uk/playlist-layout-editor-amarok.png           |  Bin 0 -> 90293 bytes
 .../playlist-layout-item-configuration-amarok.png  |  Bin 0 -> 31398 bytes
 doc/uk/playlist-ordering.png                       |  Bin 0 -> 5657 bytes
 doc/uk/playlist.png                                |  Bin 0 -> 23769 bytes
 doc/uk/queue_example11.png                         |  Bin 0 -> 39339 bytes
 doc/uk/queue_example12.png                         |  Bin 0 -> 60090 bytes
 doc/uk/queue_example_2.png                         |  Bin 0 -> 98353 bytes
 doc/uk/queue_example_4.png                         |  Bin 0 -> 26359 bytes
 doc/uk/remotecollections_ampache_client1.png       |  Bin 0 -> 31166 bytes
 doc/uk/remotecollections_client.png                |  Bin 0 -> 89287 bytes
 doc/uk/remotecollections_samba_server.png          |  Bin 0 -> 36175 bytes
 doc/uk/remotecollections_samba_server1.png         |  Bin 0 -> 66628 bytes
 doc/uk/remotecollections_samba_server2.png         |  Bin 0 -> 24749 bytes
 doc/uk/remotecollections_samba_server3.png         |  Bin 0 -> 34641 bytes
 doc/uk/repeat-menu.png                             |  Bin 0 -> 17745 bytes
 doc/uk/save-playlist-menu.png                      |  Bin 0 -> 6886 bytes
 doc/uk/searchincollection.png                      |  Bin 0 -> 15079 bytes
 doc/uk/searchincollection_example_editbox.png      |  Bin 0 -> 91268 bytes
 doc/uk/searchincollection_example_editbox2.png     |  Bin 0 -> 116832 bytes
 doc/uk/tagedit_fromfile_advanced.png               |  Bin 0 -> 96257 bytes
 doc/uk/tagedit_fromfile_basic.png                  |  Bin 0 -> 116819 bytes
 doc/uk/toolbar_main.png                            |  Bin 0 -> 33401 bytes
 doc/uk/toolbar_slim.png                            |  Bin 0 -> 11209 bytes
 doc/uk/tools_bookmarkmanager.png                   |  Bin 0 -> 36713 bytes
 doc/uk/tools_covermanager.png                      |  Bin 0 -> 220882 bytes
 doc/uk/tools_equalizer.png                         |  Bin 0 -> 39098 bytes
 doc/uk/transcode_1.png                             |  Bin 0 -> 65344 bytes
 external/CMakeLists.txt                            |    1 +
 external/README.txt                                |    1 +
 po/CMakeLists.txt                                  |   83 +-
 po/af/amarok.po                                    |23025 +++++++++++--------
 po/ar/CMakeLists.txt                               |    2 +
 po/ar/amarok.po                                    |24045 +++++++++++++++++++
 po/ast/CMakeLists.txt                              |    2 +
 po/ast/amarok.po                                   |16573 +++++++++++++
 po/be/CMakeLists.txt                               |    2 +
 po/be/amarok.po                                    |18949 +++++++++++++++
 po/bg/amarok.po                                    |22748 ++++++++++--------
 po/bg/amarok_scriptengine_qscript.po               |    3 +-
 po/bg/amarokcollectionscanner_qt.po                |  254 +-
 po/bg/amarokpkg.po                                 |    3 +-
 po/bs/CMakeLists.txt                               |    2 +
 po/bs/amarok.po                                    |15941 ++++++++++++
 po/bs/amarok_scriptengine_qscript.po               |   93 +
 po/bs/amarokcollectionscanner_qt.po                |  129 +
 po/bs/amarokpkg.po                                 |  128 +
 po/ca/amarok.po                                    |23828 ++++++++++--------
 po/ca/amarok_scriptengine_qscript.po               |   11 +-
 po/ca/amarokcollectionscanner_qt.po                |  182 +-
 po/ca/amarokpkg.po                                 |    8 +-
 po/ca at valencia/amarok.po                           |25285 +++++++++++---------
 po/ca at valencia/amarok_scriptengine_qscript.po      |    4 +-
 po/ca at valencia/amarokcollectionscanner_qt.po       |  210 +-
 po/ca at valencia/amarokpkg.po                        |    7 +-
 po/cs/amarok.po                                    |23446 ++++++++++--------
 po/cs/amarok_scriptengine_qscript.po               |    3 +-
 po/cs/amarokcollectionscanner_qt.po                |  180 +-
 po/cs/amarokpkg.po                                 |    3 +-
 po/csb/CMakeLists.txt                              |    2 +
 po/csb/amarok.po                                   |18874 +++++++++++++++
 po/da/amarok.po                                    |23702 +++++++++++--------
 po/da/amarok_scriptengine_qscript.po               |    3 +-
 po/da/amarokcollectionscanner_qt.po                |  170 +-
 po/da/amarokpkg.po                                 |    3 +-
 po/de/amarok.po                                    |23955 ++++++++++---------
 po/de/amarok_scriptengine_qscript.po               |    3 +-
 po/de/amarokcollectionscanner_qt.po                |  178 +-
 po/de/amarokpkg.po                                 |    3 +-
 po/el/amarok.po                                    |25179 +++++++++++---------
 po/el/amarok_scriptengine_qscript.po               |    3 +-
 po/el/amarokcollectionscanner_qt.po                |  161 +-
 po/el/amarokpkg.po                                 |    3 +-
 po/en_GB/amarok.po                                 |22599 ++++++++++--------
 po/en_GB/amarok_scriptengine_qscript.po            |    3 +-
 po/en_GB/amarokcollectionscanner_qt.po             |  200 +-
 po/en_GB/amarokpkg.po                              |    3 +-
 po/eo/CMakeLists.txt                               |    2 +
 po/eo/amarok.po                                    |19448 +++++++++++++++
 po/eo/amarok_scriptengine_qscript.po               |   93 +
 po/eo/amarokcollectionscanner_qt.po                |   65 +
 po/eo/amarokpkg.po                                 |  128 +
 po/es/amarok.po                                    |23763 ++++++++++--------
 po/es/amarok_scriptengine_qscript.po               |    3 +-
 po/es/amarokcollectionscanner_qt.po                |  175 +-
 po/es/amarokpkg.po                                 |   19 +-
 po/et/amarok.po                                    |22791 ++++++++++--------
 po/et/amarok_scriptengine_qscript.po               |    3 +-
 po/et/amarokcollectionscanner_qt.po                |  199 +-
 po/et/amarokpkg.po                                 |    3 +-
 po/eu/CMakeLists.txt                               |    2 +
 po/eu/amarok.po                                    |17565 ++++++++++++++
 po/eu/amarok_scriptengine_qscript.po               |   87 +
 po/eu/amarokcollectionscanner_qt.po                |   94 +
 po/eu/amarokpkg.po                                 |  118 +
 po/fa/CMakeLists.txt                               |    2 +
 po/fa/amarok.po                                    |14672 ++++++++++++
 po/fa/amarokcollectionscanner_qt.po                |   66 +
 po/fa/amarokpkg.po                                 |  119 +
 po/fi/CMakeLists.txt                               |    2 +
 po/fi/amarok.po                                    |17230 +++++++++++++
 po/fi/amarok_scriptengine_qscript.po               |   90 +
 po/fi/amarokcollectionscanner_qt.po                |  125 +
 po/fi/amarokpkg.po                                 |  121 +
 po/fr/amarok.po                                    |24200 +++++++++++--------
 po/fr/amarok_scriptengine_qscript.po               |   16 +-
 po/fr/amarokcollectionscanner_qt.po                |  184 +-
 po/fr/amarokpkg.po                                 |    3 +-
 po/ga/amarok.po                                    |21763 ++++++++++-------
 po/ga/amarok_scriptengine_qscript.po               |    3 +-
 po/ga/amarokcollectionscanner_qt.po                |  120 +-
 po/ga/amarokpkg.po                                 |    3 +-
 po/gl/CMakeLists.txt                               |    2 +
 po/gl/amarok.po                                    |16054 +++++++++++++
 po/gl/amarok_scriptengine_qscript.po               |   95 +
 po/gl/amarokcollectionscanner_qt.po                |  133 +
 po/gl/amarokpkg.po                                 |  126 +
 po/he/CMakeLists.txt                               |    2 +
 po/he/amarok.po                                    |17221 +++++++++++++
 po/hr/CMakeLists.txt                               |    2 +
 po/hr/amarok.po                                    |15317 ++++++++++++
 po/hr/amarok_scriptengine_qscript.po               |   93 +
 po/hr/amarokcollectionscanner_qt.po                |   69 +
 po/hr/amarokpkg.po                                 |  122 +
 po/hu/amarok.po                                    |23286 +++++++++++--------
 po/hu/amarok_scriptengine_qscript.po               |    5 +-
 po/hu/amarokcollectionscanner_qt.po                |  213 +-
 po/hu/amarokpkg.po                                 |   20 +-
 po/is/CMakeLists.txt                               |    2 +
 po/is/amarok.po                                    |17141 +++++++++++++
 po/is/amarok_scriptengine_qscript.po               |   93 +
 po/is/amarokpkg.po                                 |  126 +
 po/it/amarok.po                                    |22418 ++++++++++--------
 po/it/amarok_scriptengine_qscript.po               |    3 +-
 po/it/amarokcollectionscanner_qt.po                |  175 +-
 po/it/amarokpkg.po                                 |    3 +-
 po/ja/amarok.po                                    |23533 ++++++++++--------
 po/ja/amarok_scriptengine_qscript.po               |    3 +-
 po/ja/amarokcollectionscanner_qt.po                |  125 +-
 po/ja/amarokpkg.po                                 |   22 +-
 po/km/CMakeLists.txt                               |    2 +
 po/km/amarok.po                                    |16140 +++++++++++++
 po/km/amarok_scriptengine_qscript.po               |   91 +
 po/km/amarokcollectionscanner_qt.po                |  125 +
 po/km/amarokpkg.po                                 |  122 +
 po/ko/CMakeLists.txt                               |    2 +
 po/ko/amarok.po                                    |19255 +++++++++++++++
 po/ko/amarok_scriptengine_qscript.po               |   90 +
 po/ko/amarokcollectionscanner_qt.po                |  135 +
 po/ko/amarokpkg.po                                 |  119 +
 po/ku/CMakeLists.txt                               |    2 +
 po/ku/amarok.po                                    |19109 +++++++++++++++
 po/lt/amarok.po                                    |23790 ++++++++++--------
 po/lt/amarok_scriptengine_qscript.po               |   25 +-
 po/lt/amarokcollectionscanner_qt.po                |  203 +-
 po/lt/amarokpkg.po                                 |   45 +-
 po/lv/amarok.po                                    |24214 +++++++++++--------
 po/lv/amarok_scriptengine_qscript.po               |    3 +-
 po/lv/amarokcollectionscanner_qt.po                |  119 +-
 po/lv/amarokpkg.po                                 |    3 +-
 po/mai/CMakeLists.txt                              |    2 +
 po/mai/amarok.po                                   |15120 ++++++++++++
 po/mai/amarok_scriptengine_qscript.po              |   91 +
 po/mai/amarokcollectionscanner_qt.po               |   67 +
 po/mai/amarokpkg.po                                |  120 +
 po/ml/CMakeLists.txt                               |    2 +
 po/ml/amarok.po                                    |15919 ++++++++++++
 po/ms/CMakeLists.txt                               |    2 +
 po/ms/amarok.po                                    |20040 ++++++++++++++++
 po/nb/amarok.po                                    |23497 ++++++++++--------
 po/nb/amarok_scriptengine_qscript.po               |    4 +-
 po/nb/amarokcollectionscanner_qt.po                |  167 +-
 po/nb/amarokpkg.po                                 |    4 +-
 po/nds/amarok.po                                   |24891 +++++++++++---------
 po/nds/amarok_scriptengine_qscript.po              |    3 +-
 po/nds/amarokcollectionscanner_qt.po               |  141 +-
 po/nds/amarokpkg.po                                |    3 +-
 po/ne/CMakeLists.txt                               |    2 +
 po/ne/amarok.po                                    |23610 ++++++++++++++++++
 po/nl/amarok.po                                    |24407 +++++++++++--------
 po/nl/amarok_scriptengine_qscript.po               |    3 +-
 po/nl/amarokcollectionscanner_qt.po                |  170 +-
 po/nl/amarokpkg.po                                 |    7 +-
 po/nn/CMakeLists.txt                               |    2 +
 po/nn/amarok.po                                    |14584 +++++++++++
 po/nn/amarok_scriptengine_qscript.po               |   92 +
 po/nn/amarokcollectionscanner_qt.po                |   69 +
 po/nn/amarokpkg.po                                 |  124 +
 po/oc/CMakeLists.txt                               |    2 +
 po/oc/amarok.po                                    |17249 +++++++++++++
 po/pa/amarok.po                                    |23702 +++++++++++--------
 po/pa/amarokcollectionscanner_qt.po                |  134 +-
 po/pa/amarokpkg.po                                 |    9 +-
 po/pl/amarok.po                                    |24845 +++++++++++---------
 po/pl/amarok_scriptengine_qscript.po               |    3 +-
 po/pl/amarokcollectionscanner_qt.po                |  254 +-
 po/pl/amarokpkg.po                                 |   18 +-
 po/pt/amarok.po                                    |23707 ++++++++++--------
 po/pt/amarok_scriptengine_qscript.po               |    3 +-
 po/pt/amarokcollectionscanner_qt.po                |  175 +-
 po/pt/amarokpkg.po                                 |    3 +-
 po/pt_BR/amarok.po                                 |23744 ++++++++++--------
 po/pt_BR/amarok_scriptengine_qscript.po            |    3 +-
 po/pt_BR/amarokcollectionscanner_qt.po             |  177 +-
 po/pt_BR/amarokpkg.po                              |    3 +-
 po/ro/CMakeLists.txt                               |    2 +
 po/ro/amarok.po                                    |18264 ++++++++++++++
 po/ro/amarok_scriptengine_qscript.po               |   91 +
 po/ro/amarokcollectionscanner_qt.po                |   68 +
 po/ro/amarokpkg.po                                 |  126 +
 po/ru/amarok.po                                    |23488 +++++++++++--------
 po/ru/amarok_scriptengine_qscript.po               |   11 +-
 po/ru/amarokcollectionscanner_qt.po                |  191 +-
 po/ru/amarokpkg.po                                 |   11 +-
 po/se/CMakeLists.txt                               |    2 +
 po/se/amarok.po                                    |14511 +++++++++++
 po/se/amarokcollectionscanner_qt.po                |   68 +
 po/si/CMakeLists.txt                               |    2 +
 po/si/amarok.po                                    |15912 ++++++++++++
 po/sk/amarok.po                                    |25051 +++++++++++---------
 po/sk/amarok_scriptengine_qscript.po               |    3 +-
 po/sk/amarokcollectionscanner_qt.po                |  138 +-
 po/sk/amarokpkg.po                                 |    3 +-
 po/sl/amarok.po                                    |23525 +++++++++++--------
 po/sl/amarok_scriptengine_qscript.po               |   50 +-
 po/sl/amarokcollectionscanner_qt.po                |  183 +-
 po/sl/amarokpkg.po                                 |    3 +-
 po/sq/CMakeLists.txt                               |    2 +
 po/sq/amarok.po                                    |14787 ++++++++++++
 po/sq/amarok_scriptengine_qscript.po               |   92 +
 po/sq/amarokcollectionscanner_qt.po                |   68 +
 po/sq/amarokpkg.po                                 |  119 +
 po/sr/amarok.po                                    |24257 +++++++++++---------
 po/sr/amarok_scriptengine_qscript.po               |    2 +-
 po/sr/amarokcollectionscanner_qt.po                |  209 +-
 po/sr/amarokpkg.po                                 |    2 +-
 po/sr at ijekavian/amarok.po                          |24265 +++++++++++---------
 po/sr at ijekavian/amarok_scriptengine_qscript.po     |    2 +-
 po/sr at ijekavian/amarokcollectionscanner_qt.po      |  214 +-
 po/sr at ijekavian/amarokpkg.po                       |    2 +-
 po/sr at ijekavianlatin/amarok.po                     |24271 +++++++++++---------
 .../amarok_scriptengine_qscript.po                 |    2 +-
 po/sr at ijekavianlatin/amarokcollectionscanner_qt.po |  214 +-
 po/sr at ijekavianlatin/amarokpkg.po                  |    2 +-
 po/sr at latin/amarok.po                              |24293 +++++++++++---------
 po/sr at latin/amarok_scriptengine_qscript.po         |    2 +-
 po/sr at latin/amarokcollectionscanner_qt.po          |  209 +-
 po/sr at latin/amarokpkg.po                           |    2 +-
 po/sv/amarok.po                                    |23594 ++++++++++--------
 po/sv/amarok_scriptengine_qscript.po               |    3 +-
 po/sv/amarokcollectionscanner_qt.po                |  169 +-
 po/sv/amarokpkg.po                                 |    3 +-
 po/tg/CMakeLists.txt                               |    2 +
 po/tg/amarok.po                                    |15203 ++++++++++++
 po/th/amarok.po                                    |23167 +++++++++++--------
 po/th/amarokpkg.po                                 |    3 +-
 po/tr/CMakeLists.txt                               |    2 +
 po/tr/amarok.po                                    |21865 +++++++++++++++++
 po/tr/amarok_scriptengine_qscript.po               |   90 +
 po/tr/amarokcollectionscanner_qt.po                |  142 +
 po/tr/amarokpkg.po                                 |  121 +
 po/ug/CMakeLists.txt                               |    2 +
 po/ug/amarok.po                                    |14405 +++++++++++
 po/ug/amarok_scriptengine_qscript.po               |   90 +
 po/ug/amarokcollectionscanner_qt.po                |   66 +
 po/ug/amarokpkg.po                                 |  121 +
 po/uk/amarok.po                                    |24046 +++++++++++---------
 po/uk/amarok_scriptengine_qscript.po               |    7 +-
 po/uk/amarokcollectionscanner_qt.po                |  188 +-
 po/uk/amarokpkg.po                                 |    7 +-
 po/wa/CMakeLists.txt                               |    2 +
 po/wa/amarok.po                                    |18052 ++++++++++++++
 po/wa/amarokcollectionscanner_qt.po                |   96 +
 po/zh_CN/amarok.po                                 |22345 ++++++++++--------
 po/zh_CN/amarok_scriptengine_qscript.po            |    3 +-
 po/zh_CN/amarokcollectionscanner_qt.po             |  175 +-
 po/zh_CN/amarokpkg.po                              |    3 +-
 po/zh_TW/CMakeLists.txt                            |    2 +
 po/zh_TW/amarok.po                                 |14943 ++++++++++++
 po/zh_TW/amarok_scriptengine_qscript.po            |   90 +
 po/zh_TW/amarokcollectionscanner_qt.po             |   93 +
 po/zh_TW/amarokpkg.po                              |  117 +
 shared/FileType.cpp                                |   66 +
 shared/FileType.h                                  |   36 +-
 shared/FileTypeResolver.cpp                        |  152 +
 shared/FileTypeResolver.h                          |   43 +
 shared/MetaReplayGain.cpp                          |    3 +-
 shared/MetaReplayGain.h                            |    9 +-
 shared/MetaTagLib.cpp                              |  398 +
 shared/MetaTagLib.h                                |   55 +
 shared/MetaValues.h                                |   85 +
 shared/TagsFromFileNameGuesser.cpp                 |  143 +
 shared/TagsFromFileNameGuesser.h                   |   62 +
 shared/Version.h                                   |    2 +-
 shared/tag_helpers/APETagHelper.cpp                |  116 +
 shared/tag_helpers/APETagHelper.h                  |   44 +
 shared/tag_helpers/ASFTagHelper.cpp                |  420 +
 shared/tag_helpers/ASFTagHelper.h                  |   49 +
 shared/tag_helpers/ID3v2TagHelper.cpp              |  436 +
 shared/tag_helpers/ID3v2TagHelper.h                |   50 +
 shared/tag_helpers/MP4TagHelper.cpp                |  214 +
 shared/tag_helpers/MP4TagHelper.h                  |   49 +
 shared/tag_helpers/StringHelper.cpp                |   46 +
 shared/tag_helpers/StringHelper.h                  |   58 +
 shared/tag_helpers/TagHelper.cpp                   |  331 +
 shared/tag_helpers/TagHelper.h                     |  152 +
 shared/tag_helpers/VorbisCommentTagHelper.cpp      |  124 +
 shared/tag_helpers/VorbisCommentTagHelper.h        |   45 +
 .../asffiletyperesolver.cpp                        |   44 -
 .../asffiletyperesolver.h                          |   41 -
 .../mimefiletyperesolver.cpp                       |  120 -
 .../mimefiletyperesolver.h                         |   40 -
 .../mp4filetyperesolver.cpp                        |   44 -
 .../mp4filetyperesolver.h                          |   40 -
 .../wavfiletyperesolver.cpp                        |   42 -
 .../wavfiletyperesolver.h                          |   36 -
 src/ActionClasses.cpp                              |  172 +-
 src/ActionClasses.h                                |   32 +-
 src/AmarokMimeData.cpp                             |    5 +-
 src/AmarokMimeData.h                               |    2 +-
 src/App.cpp                                        |  382 +-
 src/App.h                                          |   29 +-
 src/CMakeLists.txt                                 |  377 +-
 src/DirectoryLoader.cpp                            |    5 +-
 src/EngineController.cpp                           |  777 +-
 src/EngineController.h                             |  268 +-
 src/Expression.cpp                                 |  193 -
 src/Expression.h                                   |   69 -
 src/KNotificationBackend.cpp                       |   91 +-
 src/KNotificationBackend.h                         |   18 +-
 src/LastfmReadLabelCapability.h                    |    3 +
 src/MainWindow.cpp                                 |  841 +-
 src/MainWindow.h                                   |  132 +-
 src/MediaDeviceCache.cpp                           |  148 +-
 src/MediaDeviceCache.h                             |    5 +
 src/MountPointManager.cpp                          |  631 +
 src/MountPointManager.h                            |  259 +
 src/OpmlOutline.cpp                                |   43 +
 src/OpmlOutline.h                                  |   72 +
 src/OpmlParser.cpp                                 |  438 +-
 src/OpmlParser.h                                   |  246 +-
 src/OpmlWriter.cpp                                 |   77 +
 src/OpmlWriter.h                                   |   67 +
 src/PaletteHandler.cpp                             |   52 +-
 src/PaletteHandler.h                               |   21 +-
 src/PluginManager.cpp                              |  275 +
 src/PluginManager.h                                |   79 +
 src/QStringx.cpp                                   |  361 +
 src/QStringx.h                                     |  148 +-
 src/ScriptManager.cpp                              |  548 +
 src/ScriptManager.h                                |  154 +
 src/ScriptUpdater.cpp                              |  269 +
 src/ScriptUpdater.h                                |   62 +
 src/SvgHandler.cpp                                 |   52 +-
 src/SvgHandler.h                                   |   15 +-
 src/SvgTinter.cpp                                  |   24 +-
 src/SvgTinter.h                                    |    6 +-
 src/ToolBar.h                                      |  108 -
 src/TrayIcon.cpp                                   |  240 +-
 src/TrayIcon.h                                     |   41 +-
 src/TrayIconLegacy.cpp                             |  476 -
 src/TrayIconLegacy.h                               |   83 -
 src/aboutdialog/ExtendedAboutDialog.cpp            |   94 +-
 src/aboutdialog/ExtendedAboutDialog.h              |   19 +-
 src/aboutdialog/OcsData.cpp                        |    5 +
 src/aboutdialog/OcsData.h                          |    3 +
 src/aboutdialog/OcsPersonItem.cpp                  |   14 +-
 src/amarok-play-audiocd.desktop                    |    5 +-
 src/amarok.desktop                                 |   24 +-
 src/amarok.knsrc                                   |    8 -
 src/amarok_addaspodcast.desktop                    |    9 +-
 src/amarok_append.desktop                          |   20 +-
 src/amarok_containers.desktop                      |   25 +-
 src/amarok_plugin.desktop                          |    4 +-
 src/amarokconfig.kcfg                              |  121 +-
 src/amarokurls/AmarokUrl.cpp                       |   31 +-
 src/amarokurls/AmarokUrlHandler.cpp                |    2 +-
 src/amarokurls/BookmarkCurrentButton.cpp           |    1 +
 src/amarokurls/BookmarkGroup.h                     |    1 +
 src/amarokurls/BookmarkManager.cpp                 |    3 +-
 src/amarokurls/BookmarkManagerWidget.cpp           |    2 +-
 src/amarokurls/BookmarkMetaActions.cpp             |    3 +-
 src/amarokurls/BookmarkTreeView.cpp                |    2 +-
 src/amarokurls/ContextUrlRunner.cpp                |    3 +
 src/amarokurls/NavigationUrlGenerator.cpp          |   12 +-
 src/amarokurls/NavigationUrlRunner.cpp             |    6 +-
 src/amarokurls/PlayUrlGenerator.cpp                |    4 +-
 src/amarokurls/PlayUrlRunner.cpp                   |    2 +-
 src/app_mac.cpp                                    |    2 +-
 src/browsers/BrowserBreadcrumbItem.cpp             |   18 +-
 src/browsers/BrowserBreadcrumbItem.h               |   12 +-
 src/browsers/BrowserBreadcrumbWidget.cpp           |  140 +-
 src/browsers/BrowserBreadcrumbWidget.h             |   12 -
 src/browsers/BrowserCategory.cpp                   |   46 +-
 src/browsers/BrowserCategory.h                     |   34 +-
 src/browsers/BrowserCategoryList.cpp               |  264 +-
 src/browsers/BrowserCategoryList.h                 |   67 +-
 src/browsers/BrowserCategoryListDelegate.cpp       |    6 +-
 src/browsers/BrowserCategoryListModel.cpp          |    5 +-
 src/browsers/BrowserCategoryListModel.h            |   10 +-
 src/browsers/BrowserDock.cpp                       |   81 +-
 src/browsers/BrowserDock.h                         |   13 +-
 src/browsers/BrowserMessageArea.cpp                |  169 +
 src/browsers/BrowserMessageArea.h                  |   67 +
 src/browsers/CollectionSortFilterProxyModel.cpp    |  117 +-
 src/browsers/CollectionSortFilterProxyModel.h      |    2 +-
 src/browsers/CollectionTreeItem.cpp                |  140 +-
 src/browsers/CollectionTreeItem.h                  |   13 +-
 src/browsers/CollectionTreeItemModel.cpp           |   91 +-
 src/browsers/CollectionTreeItemModel.h             |    5 +-
 src/browsers/CollectionTreeItemModelBase.cpp       |  814 +-
 src/browsers/CollectionTreeItemModelBase.h         |   34 +-
 src/browsers/CollectionTreeView.cpp                |  265 +-
 src/browsers/CollectionTreeView.h                  |   39 +-
 src/browsers/SingleCollectionTreeItemModel.cpp     |    8 +-
 .../CollectionBrowserTreeView.cpp                  |   68 +-
 .../collectionbrowser/CollectionBrowserTreeView.h  |    4 +
 .../CollectionTreeItemDelegate.cpp                 |   61 +-
 .../collectionbrowser/CollectionTreeItemDelegate.h |    5 +
 .../collectionbrowser/CollectionWidget.cpp         |  440 +-
 src/browsers/collectionbrowser/CollectionWidget.h  |   22 +-
 src/browsers/filebrowser/FileBrowser.cpp           |  239 +-
 src/browsers/filebrowser/FileBrowser.h             |   16 +-
 src/browsers/filebrowser/FileBrowser_p.h           |    8 +-
 src/browsers/filebrowser/FileView.cpp              |  197 +-
 src/browsers/filebrowser/FileView.h                |   29 +-
 src/browsers/playlistbrowser/APGCategory.cpp       |   26 +-
 src/browsers/playlistbrowser/APGCategory.h         |    5 +-
 .../playlistbrowser/DynamicBiasDelegate.cpp        |   90 +-
 src/browsers/playlistbrowser/DynamicBiasDelegate.h |   39 +-
 src/browsers/playlistbrowser/DynamicBiasModel.cpp  |  315 -
 src/browsers/playlistbrowser/DynamicBiasModel.h    |   85 -
 .../playlistbrowser/DynamicBiasWidgets.cpp         | 1148 +-
 src/browsers/playlistbrowser/DynamicBiasWidgets.h  |  201 +-
 src/browsers/playlistbrowser/DynamicCategory.cpp   |  344 +-
 src/browsers/playlistbrowser/DynamicCategory.h     |   54 +-
 src/browsers/playlistbrowser/DynamicModel.cpp      |  614 -
 src/browsers/playlistbrowser/DynamicModel.h        |  121 -
 src/browsers/playlistbrowser/DynamicView.cpp       |  297 +
 src/browsers/playlistbrowser/DynamicView.h         |   67 +
 src/browsers/playlistbrowser/PlaylistBrowser.cpp   |    8 +-
 src/browsers/playlistbrowser/PlaylistBrowser.h     |    2 +-
 .../playlistbrowser/PlaylistBrowserCategory.cpp    |   66 +-
 .../playlistbrowser/PlaylistBrowserCategory.h      |   11 +-
 .../playlistbrowser/PlaylistBrowserFilterProxy.cpp |   50 +
 .../playlistbrowser/PlaylistBrowserFilterProxy.h   |   44 +
 .../playlistbrowser/PlaylistBrowserModel.cpp       |  269 +-
 .../playlistbrowser/PlaylistBrowserModel.h         |   13 +-
 .../playlistbrowser/PlaylistBrowserView.cpp        |  140 +-
 src/browsers/playlistbrowser/PlaylistBrowserView.h |    4 +
 .../playlistbrowser/PlaylistTreeItemDelegate.cpp   |   24 +-
 .../playlistbrowser/PlaylistTreeItemDelegate.h     |    5 +
 .../playlistbrowser/PlaylistsByProviderProxy.cpp   |   88 +-
 .../playlistbrowser/PlaylistsByProviderProxy.h     |   15 +-
 .../playlistbrowser/PlaylistsInFoldersProxy.cpp    |   83 +-
 .../playlistbrowser/PlaylistsInFoldersProxy.h      |   11 +-
 src/browsers/playlistbrowser/PodcastCategory.cpp   |   29 +-
 src/browsers/playlistbrowser/PodcastModel.cpp      |   86 +-
 src/browsers/playlistbrowser/PodcastModel.h        |   12 +-
 src/browsers/playlistbrowser/QtGroupingProxy.cpp   |  496 +-
 src/browsers/playlistbrowser/QtGroupingProxy.h     |   41 +-
 .../playlistbrowser/UserPlaylistCategory.cpp       |    2 +-
 src/browsers/playlistbrowser/UserPlaylistModel.cpp |   30 +-
 src/browsers/servicebrowser/ServiceBrowser.cpp     |   10 +-
 src/browsers/servicebrowser/ServiceBrowser.h       |    2 +-
 src/configdialog/ConfigDialog.cpp                  |   24 +-
 src/configdialog/ConfigDialog.h                    |    4 +-
 src/configdialog/dialogs/DatabaseConfig.ui         |   34 +
 src/configdialog/dialogs/GeneralConfig.ui          |   44 +-
 src/configdialog/dialogs/NotificationsConfig.cpp   |   27 +-
 src/configdialog/dialogs/NotificationsConfig.h     |    1 -
 src/configdialog/dialogs/NotificationsConfig.ui    |   68 +-
 src/configdialog/dialogs/PlaybackConfig.ui         |   19 +-
 src/configdialog/dialogs/PluginsConfig.cpp         |   92 +
 src/configdialog/dialogs/PluginsConfig.h           |   47 +
 src/configdialog/dialogs/ScriptSelector.cpp        |   73 +
 src/configdialog/dialogs/ScriptSelector.h          |   48 +
 src/configdialog/dialogs/ScriptsConfig.cpp         |  110 +
 src/configdialog/dialogs/ScriptsConfig.h           |   50 +
 src/configdialog/dialogs/ScriptsConfig.ui          |   85 +
 src/configdialog/dialogs/ServiceConfig.cpp         |   98 -
 src/configdialog/dialogs/ServiceConfig.h           |   57 -
 src/context/Applet.cpp                             |  319 +-
 src/context/Applet.h                               |  150 +-
 src/context/ContextDock.cpp                        |   56 +-
 src/context/ContextDock.h                          |   18 +-
 src/context/ContextScene.cpp                       |    4 +
 src/context/ContextView.cpp                        |  177 +-
 src/context/ContextView.h                          |   54 +-
 src/context/CoverBling.cpp                         |  269 -
 src/context/CoverBling.h                           |   55 -
 src/context/DataEngine.h                           |    2 +-
 src/context/LyricsManager.cpp                      |  244 +-
 src/context/LyricsManager.h                        |   64 +-
 src/context/ToolbarView.cpp                        |  128 +-
 src/context/ToolbarView.h                          |    8 +-
 src/context/applets/CMakeLists.txt                 |    2 +
 src/context/applets/albums/AlbumItem.cpp           |   83 +-
 src/context/applets/albums/AlbumItem.h             |   17 +-
 src/context/applets/albums/Albums.cpp              |  402 +-
 src/context/applets/albums/Albums.h                |   61 +-
 src/context/applets/albums/AlbumsDefs.h            |   40 +
 src/context/applets/albums/AlbumsModel.cpp         |  164 +-
 src/context/applets/albums/AlbumsModel.h           |   65 +-
 src/context/applets/albums/AlbumsView.cpp          |  484 +-
 src/context/applets/albums/AlbumsView.h            |   87 +-
 src/context/applets/albums/CMakeLists.txt          |    6 +-
 src/context/applets/albums/TrackItem.cpp           |   79 +-
 src/context/applets/albums/TrackItem.h             |    8 +-
 .../albums/amarok-context-applet-albums.desktop    |    6 +-
 src/context/applets/currenttrack/CMakeLists.txt    |   21 +-
 src/context/applets/currenttrack/CurrentTrack.cpp  | 1213 +-
 src/context/applets/currenttrack/CurrentTrack.h    |  146 +-
 .../amarok-context-applet-currenttrack.desktop     |   11 +-
 .../applets/currenttrack/currentTrackSettings.ui   |   55 +-
 src/context/applets/info/CMakeLists.txt            |    8 +-
 src/context/applets/info/InfoApplet.cpp            |   53 +-
 src/context/applets/info/InfoApplet.h              |   29 +-
 .../info/amarok-context-applet-info.desktop        |    9 +
 src/context/applets/labels/CMakeLists.txt          |   12 +-
 src/context/applets/labels/LabelGraphicsItem.cpp   |  401 +-
 src/context/applets/labels/LabelGraphicsItem.h     |   62 +-
 src/context/applets/labels/LabelOverlayButton.cpp  |  118 +
 src/context/applets/labels/LabelOverlayButton.h    |   61 +
 src/context/applets/labels/LabelsApplet.cpp        |  859 +-
 src/context/applets/labels/LabelsApplet.h          |   89 +-
 .../labels/amarok-context-applet-labels.desktop    |   23 +-
 .../applets/labels/labelsBlacklistSettings.ui      |   89 +
 .../applets/labels/labelsGeneralSettings.ui        |  363 +
 .../applets/labels/labelsReplacementSettings.ui    |  152 +
 src/context/applets/labels/labelsSettings.ui       |  205 -
 src/context/applets/lyrics/CMakeLists.txt          |   11 +-
 src/context/applets/lyrics/LyricsApplet.cpp        | 1027 +-
 src/context/applets/lyrics/LyricsApplet.h          |   67 +-
 src/context/applets/lyrics/LyricsBrowser.cpp       |  162 +
 src/context/applets/lyrics/LyricsBrowser.h         |   64 +
 .../applets/lyrics/LyricsSuggestionsListWidget.cpp |  119 +
 .../applets/lyrics/LyricsSuggestionsListWidget.h   |   92 +
 .../lyrics/amarok-context-applet-lyrics.desktop    |    7 +-
 src/context/applets/lyrics/lyricsSettings.ui       |   74 +-
 src/context/applets/photos/CMakeLists.txt          |   11 +-
 src/context/applets/photos/DragPixmapItem.cpp      |    5 +-
 src/context/applets/photos/PhotosApplet.cpp        |  258 +-
 src/context/applets/photos/PhotosApplet.h          |   42 +-
 src/context/applets/photos/PhotosScrollWidget.cpp  |  375 +-
 src/context/applets/photos/PhotosScrollWidget.h    |   50 +-
 .../photos/amarok-context-applet-photos.desktop    |    8 +
 src/context/applets/playlistinfo/CMakeLists.txt    |    6 +-
 src/context/applets/playlistinfo/PlaylistInfo.h    |    2 +-
 .../amarok-context-applet-playlistinfo.desktop     |    4 +-
 .../applets/similarartists/ArtistWidget.cpp        |  780 +-
 src/context/applets/similarartists/ArtistWidget.h  |  243 +-
 src/context/applets/similarartists/CMakeLists.txt  |    9 +-
 .../applets/similarartists/SimilarArtist.cpp       |  126 +-
 src/context/applets/similarartists/SimilarArtist.h |   62 +-
 .../similarartists/SimilarArtistsApplet.cpp        |  538 +-
 .../applets/similarartists/SimilarArtistsApplet.h  |  112 +-
 .../amarok-context-applet-similarArtists.desktop   |   10 +
 .../similarartists/similarArtistsSettings.ui       |   88 +-
 src/context/applets/songkick/SongkickApplet.cpp    |    9 +-
 src/context/applets/songkick/SongkickApplet.h      |    5 +-
 .../amarok-context-applet-songkick.desktop         |    6 +
 .../applets/spectrumanalyzer/AnalyzerGlWidget.cpp  |  447 +
 .../applets/spectrumanalyzer/AnalyzerGlWidget.h    |  210 +
 .../applets/spectrumanalyzer/CMakeLists.txt        |   23 +
 .../spectrumanalyzer/FastFourierTransformation.cpp |  171 +
 .../spectrumanalyzer/FastFourierTransformation.h   |   74 +
 .../spectrumanalyzer/SpectrumAnalyzerApplet.cpp    |  707 +
 .../spectrumanalyzer/SpectrumAnalyzerApplet.h      |  196 +
 .../SpectrumAnalyzerAppletCustomStyle.css}         |    0
 .../spectrumanalyzer/SplineInterpolation.cpp       |  202 +
 .../applets/spectrumanalyzer/SplineInterpolation.h |   84 +
 ...amarok-context-applet-spectrum-analyzer.desktop |   34 +
 .../amarok-spectrum-analyzer-applet.svg            |   74 +
 .../spectrumanalyzer/spectrumAnalyzerSettings.ui   |  167 +
 src/context/applets/tabs/CMakeLists.txt            |   20 +
 src/context/applets/tabs/ReloadEditDialog.ui       |   98 +
 src/context/applets/tabs/TabsApplet.cpp            |  336 +
 src/context/applets/tabs/TabsApplet.h              |   93 +
 src/context/applets/tabs/TabsItem.cpp              |  119 +
 src/context/applets/tabs/TabsItem.h                |   53 +
 src/context/applets/tabs/TabsSettings.ui           |   74 +
 src/context/applets/tabs/TabsView.cpp              |  241 +
 src/context/applets/tabs/TabsView.h                |   65 +
 .../tabs/amarok-context-applet-tabs.desktop        |   54 +
 src/context/applets/tabs/amarok-tabs-bass.png      |  Bin 0 -> 2656 bytes
 src/context/applets/tabs/amarok-tabs-drum.png      |  Bin 0 -> 3895 bytes
 src/context/applets/tabs/amarok-tabs-guitar.png    |  Bin 0 -> 2615 bytes
 src/context/applets/tabs/amarok-tabs-piano.png     |  Bin 0 -> 3538 bytes
 src/context/applets/upcomingevents/CMakeLists.txt  |   33 +-
 src/context/applets/upcomingevents/LastFmEvent.cpp |  110 +-
 src/context/applets/upcomingevents/LastFmEvent.h   |  236 +-
 .../upcomingevents/LastFmEventXmlParser.cpp        |  231 +
 .../applets/upcomingevents/LastFmEventXmlParser.h  |   79 +
 .../upcomingevents/UpcomingEventsApplet.cpp        |  804 +-
 .../applets/upcomingevents/UpcomingEventsApplet.h  |  162 +-
 .../UpcomingEventsCalendarWidget.cpp               |  180 +
 .../upcomingevents/UpcomingEventsCalendarWidget.h  |   54 +
 .../upcomingevents/UpcomingEventsMapWidget.cpp     |  356 +
 .../upcomingevents/UpcomingEventsMapWidget.h       |   66 +
 .../applets/upcomingevents/UpcomingEventsStack.cpp |  192 +
 .../applets/upcomingevents/UpcomingEventsStack.h   |   65 +
 .../upcomingevents/UpcomingEventsStackItem.cpp     |  507 +
 .../upcomingevents/UpcomingEventsStackItem.h       |  145 +
 .../upcomingevents/UpcomingEventsWidget.cpp        |  415 +-
 .../applets/upcomingevents/UpcomingEventsWidget.h  |  171 +-
 .../amarok-context-applet-upcomingEvents.desktop   |   10 +-
 .../upcomingevents/upcoming-events-map.html        |   87 +
 .../upcomingEventsGeneralSettings.ui               |   59 +
 .../upcomingevents/upcomingEventsVenueSettings.ui  |  310 +
 src/context/applets/videoclip/CMakeLists.txt       |    8 +-
 .../applets/videoclip/CustomVideoWidget.cpp        |    2 +-
 src/context/applets/videoclip/VideoItemButton.cpp  |   20 +-
 src/context/applets/videoclip/VideoclipApplet.cpp  |  531 +-
 src/context/applets/videoclip/VideoclipApplet.h    |   67 +-
 .../amarok-context-applet-videoclip.desktop        |   10 +-
 src/context/applets/wikipedia/CMakeLists.txt       |   17 +-
 src/context/applets/wikipedia/WikipediaApplet.cpp  |  970 +-
 src/context/applets/wikipedia/WikipediaApplet.h    |  104 +-
 src/context/applets/wikipedia/WikipediaApplet_p.h  |  284 +
 .../applets/wikipedia/WikipediaCustomStyle.css     |  326 +-
 .../amarok-context-applet-wikipedia.desktop        |    5 +
 .../applets/wikipedia/wikipediaGeneralSettings.ui  |   41 +
 .../applets/wikipedia/wikipediaLanguageSettings.ui |   81 +
 src/context/applets/wikipedia/wikipediaSettings.ui |   45 -
 src/context/containments/CMakeLists.txt            |    1 -
 .../containments/oldcontainment/CMakeLists.txt     |   18 -
 .../oldcontainment/ColumnContainment.cpp           |  882 -
 .../oldcontainment/ColumnContainment.h             |  160 -
 .../amarok-containment-context.desktop             |  117 -
 .../oldcontainment/amarok-containment-header.svg   |  110 -
 .../containments/verticallayout/CMakeLists.txt     |    6 +-
 .../verticallayout/VerticalAppletLayout.cpp        |  237 +-
 .../verticallayout/VerticalAppletLayout.h          |   17 +-
 .../verticallayout/VerticalToolbarContainment.cpp  |   54 +-
 .../verticallayout/VerticalToolbarContainment.h    |    7 +-
 .../amarok-containment-vertical.desktop            |   16 +-
 src/context/engines/CMakeLists.txt                 |    2 +
 src/context/engines/current/CurrentEngine.cpp      |  384 +-
 src/context/engines/current/CurrentEngine.h        |   53 +-
 .../current/amarok-data-engine-current.desktop     |    3 +-
 src/context/engines/info/InfoEngine.h              |    2 +-
 .../engines/info/amarok-data-engine-info.desktop   |    8 +-
 src/context/engines/labels/LabelsEngine.cpp        |  363 +-
 src/context/engines/labels/LabelsEngine.h          |   74 +-
 .../labels/amarok-data-engine-labels.desktop       |   18 +
 src/context/engines/lyrics/LyricsEngine.cpp        |  195 +-
 src/context/engines/lyrics/LyricsEngine.h          |   51 +-
 .../lyrics/amarok-data-engine-lyrics.desktop       |    9 +-
 src/context/engines/photos/CMakeLists.txt          |    9 +-
 src/context/engines/photos/PhotosEngine.cpp        |  291 +-
 src/context/engines/photos/PhotosEngine.h          |   80 +-
 src/context/engines/photos/PhotosInfo.h            |   38 +-
 .../photos/amarok-data-engine-photos.desktop       |    5 +
 .../similarartists/SimilarArtistsEngine.cpp        |  564 +-
 .../engines/similarartists/SimilarArtistsEngine.h  |  145 +-
 .../amarok-data-engine-similarArtists.desktop      |   10 +-
 src/context/engines/songkick/CMakeLists.txt        |   25 +-
 src/context/engines/songkick/JsonQt/CMakeLists.txt |   32 -
 src/context/engines/songkick/JsonQt/COMPATIBILITY  |   11 -
 src/context/engines/songkick/JsonQt/COPYING.HEADER |   13 -
 src/context/engines/songkick/JsonQt/Doxyfile.cmake |  299 -
 src/context/engines/songkick/JsonQt/README.txt     |   43 -
 .../songkick/JsonQt/add-copyright-header.sh        |   13 -
 .../engines/songkick/JsonQt/lib/CMakeLists.txt     |   76 -
 .../engines/songkick/JsonQt/lib/JsonQtExport.h     |   24 -
 .../engines/songkick/JsonQt/lib/JsonRpc.cpp        |  183 -
 src/context/engines/songkick/JsonQt/lib/JsonRpc.h  |  121 -
 .../engines/songkick/JsonQt/lib/JsonRpcAdaptor.cpp |   35 -
 .../engines/songkick/JsonQt/lib/JsonRpcAdaptor.h   |   85 -
 .../songkick/JsonQt/lib/JsonRpcAdaptorPrivate.cpp  |  367 -
 .../songkick/JsonQt/lib/JsonRpcAdaptorPrivate.h    |   60 -
 .../songkick/JsonQt/lib/JsonToProperties.cpp       |   54 -
 .../engines/songkick/JsonQt/lib/JsonToProperties.h |   53 -
 .../engines/songkick/JsonQt/lib/JsonToVariant.cpp  |  607 -
 .../engines/songkick/JsonQt/lib/JsonToVariant.h    |  161 -
 .../engines/songkick/JsonQt/lib/ParseException.cpp |   42 -
 .../engines/songkick/JsonQt/lib/ParseException.h   |   64 -
 .../engines/songkick/JsonQt/lib/VariantToJson.cpp  |   80 -
 .../engines/songkick/JsonQt/lib/VariantToJson.h    |   56 -
 .../engines/songkick/JsonQt/tests/CMakeLists.txt   |   44 -
 .../engines/songkick/JsonQt/tests/JsonRpc.cpp      |  316 -
 .../songkick/JsonQt/tests/JsonRpcAdaptor.cpp       |  274 -
 .../songkick/JsonQt/tests/JsonToProperties.cpp     |   47 -
 .../songkick/JsonQt/tests/JsonToVariant.cpp        |  167 -
 .../songkick/JsonQt/tests/VariantToJson.cpp        |   62 -
 src/context/engines/songkick/SongkickEngine.h      |    2 +-
 .../songkick/amarok-data-engine-songkick.desktop   |    4 +-
 .../engines/spectrumanalyzer/CMakeLists.txt        |   12 +
 .../spectrumanalyzer/SpectrumAnalyzerEngine.cpp    |  183 +
 .../spectrumanalyzer/SpectrumAnalyzerEngine.h      |   95 +
 .../amarok-data-engine-spectrum-analyzer.desktop   |   27 +
 src/context/engines/tabs/CMakeLists.txt            |   13 +
 src/context/engines/tabs/TabsEngine.cpp            |  515 +
 src/context/engines/tabs/TabsEngine.h              |  150 +
 src/context/engines/tabs/TabsInfo.h                |   33 +
 .../engines/tabs/amarok-data-engine-tabs.desktop   |   43 +
 src/context/engines/upcomingevents/CMakeLists.txt  |    4 +-
 .../upcomingevents/UpcomingEventsEngine.cpp        |  426 +-
 .../engines/upcomingevents/UpcomingEventsEngine.h  |  127 +-
 .../amarok-data-engine-upcomingEvents.desktop      |   10 +-
 src/context/engines/videoclip/VideoclipEngine.cpp  |  105 +-
 src/context/engines/videoclip/VideoclipEngine.h    |    2 +-
 .../videoclip/amarok-data-engine-videoclip.desktop |    7 +-
 src/context/engines/wikipedia/WikipediaEngine.cpp  | 1216 +-
 src/context/engines/wikipedia/WikipediaEngine.h    |   70 +-
 .../wikipedia/amarok-data-engine-wikipedia.desktop |    3 +-
 src/context/layouts/ContextLayout.cpp              |  321 -
 src/context/layouts/ContextLayout.h                |   68 -
 src/context/layouts/VerticalLayout.cpp             |  159 -
 src/context/layouts/VerticalLayout.h               |   64 -
 src/context/popupdropper/libpud/PopupDropper.cpp   |    5 +-
 .../popupdropper/libpud/PopupDropperItem.cpp       |   22 +-
 ...k-scriptengine-applet-simple-javascript.desktop |   11 +
 .../amarok-scriptengine-runner-javascript.desktop  |    5 +
 .../scriptengine/javascript/bind_dataengine.h      |    5 +-
 src/context/servicetypes/amarok_animator.desktop   |    4 +-
 .../servicetypes/amarok_containment.desktop        |    2 +
 .../servicetypes/amarok_context_applet.desktop     |    4 +-
 .../servicetypes/amarok_data_engine.desktop        |    8 +-
 src/context/toolbar/AppletItemOverlay.cpp          |   27 +-
 src/context/toolbar/AppletToolbar.cpp              |  155 +-
 src/context/toolbar/AppletToolbar.h                |   27 +-
 src/context/toolbar/AppletToolbarAddItem.h         |    1 -
 src/context/toolbar/AppletToolbarAppletItem.cpp    |  108 +-
 src/context/toolbar/AppletToolbarAppletItem.h      |   31 +-
 src/context/toolbar/AppletToolbarBase.cpp          |   40 +-
 src/context/widgets/AmarokWebView.cpp              |   39 -
 src/context/widgets/AmarokWebView.h                |   43 -
 src/context/widgets/AppletHeader.cpp               |  164 +
 src/context/widgets/AppletHeader.h                 |   67 +
 src/context/widgets/ContainmentArrow.cpp           |  145 +-
 src/context/widgets/ContainmentArrow.h             |   32 +-
 src/context/widgets/DropPixmapItem.cpp             |   70 +
 src/context/widgets/DropPixmapItem.h               |   35 +-
 src/context/widgets/RatingWidget.cpp               |    6 +-
 src/context/widgets/RecentlyPlayedListWidget.cpp   |  215 +
 src/context/widgets/RecentlyPlayedListWidget.h     |   55 +
 src/context/widgets/TextScrollingWidget.cpp        |  378 +-
 src/context/widgets/TextScrollingWidget.h          |   95 +-
 src/context/widgets/ToolBoxIcon.cpp                |   73 +-
 src/context/widgets/ToolBoxIcon.h                  |   18 +-
 src/context/widgets/ToolBoxMenu.cpp                |  601 -
 src/context/widgets/ToolBoxMenu.h                  |  115 -
 src/context/widgets/TrackWidget.cpp                |   24 +-
 src/context/widgets/TrackWidget.h                  |    5 +-
 .../widgets/appletexplorer/AppletExplorer.cpp      |  166 +-
 .../widgets/appletexplorer/AppletExplorer.h        |   29 +-
 src/context/widgets/appletexplorer/AppletIcon.cpp  |   81 +-
 src/context/widgets/appletexplorer/AppletIcon.h    |   19 +-
 .../widgets/appletexplorer/AppletItemModel.cpp     |  110 -
 .../widgets/appletexplorer/AppletItemModel.h       |   69 -
 src/context/widgets/appletexplorer/AppletsList.cpp |  278 -
 src/context/widgets/appletexplorer/AppletsList.h   |   88 -
 .../timecode/TimecodeEditCapability.cpp            |   13 +-
 .../capabilities/timecode/TimecodeEditCapability.h |    4 +-
 .../timecode/TimecodeWriteCapability.cpp           |    5 +-
 src/core-impl/collections/CMakeLists.txt           |    8 +-
 .../collections/audiocd/AudioCdCollection.cpp      |   94 +-
 .../collections/audiocd/AudioCdCollection.h        |   16 +-
 .../audiocd/AudioCdCollectionCapability.cpp        |   38 -
 .../audiocd/AudioCdCollectionCapability.h          |   43 -
 .../audiocd/AudioCdCollectionLocation.cpp          |    2 +-
 src/core-impl/collections/audiocd/AudioCdMeta.cpp  |   81 +-
 src/core-impl/collections/audiocd/AudioCdMeta.h    |   20 +-
 src/core-impl/collections/audiocd/CMakeLists.txt   |   70 +-
 .../amarok_collection-audiocdcollection.desktop    |   40 +-
 .../audiocd/support/AudioCdConnectionAssistant.cpp |    5 +-
 .../audiocd/support/AudioCdDeviceInfo.cpp          |    8 +-
 .../audiocd/support/AudioCdDeviceInfo.h            |    6 +-
 src/core-impl/collections/daap/CMakeLists.txt      |    3 +-
 src/core-impl/collections/daap/DaapCollection.cpp  |   39 +-
 src/core-impl/collections/daap/DaapCollection.h    |    5 +-
 src/core-impl/collections/daap/DaapMeta.cpp        |   69 +-
 src/core-impl/collections/daap/DaapMeta.h          |   13 +-
 .../daap/amarok_collection-daapcollection.desktop  |   30 +-
 .../collections/daap/daapreader/Reader.cpp         |  520 +-
 src/core-impl/collections/daap/daapreader/Reader.h |   12 +-
 src/core-impl/collections/db/CMakeLists.txt        |    3 +
 .../collections/db/DatabaseCollection.cpp          |   37 +
 src/core-impl/collections/db/DatabaseCollection.h  |  143 +
 src/core-impl/collections/db/DatabaseMeta.h        |  568 +
 src/core-impl/collections/db/ScanManager.cpp       |  758 +
 src/core-impl/collections/db/ScanManager.h         |  281 +
 .../collections/db/ScanResultProcessor.cpp         |  311 +
 src/core-impl/collections/db/ScanResultProcessor.h |  146 +
 .../db/amarok_databasecollection_export.h          |   53 +
 src/core-impl/collections/db/sql/CMakeLists.txt    |   70 +
 .../collections/db/sql/CapabilityDelegate.h        |   78 +
 .../collections/db/sql/CapabilityDelegateImpl.cpp  |  478 +
 .../collections/db/sql/CapabilityDelegateImpl.h    |   64 +
 .../collections/db/sql/DatabaseUpdater.cpp         |  991 +
 src/core-impl/collections/db/sql/DatabaseUpdater.h |   98 +
 .../sql}/DefaultSqlQueryMakerFactory.h             |    0
 src/core-impl/collections/db/sql/SqlCollection.cpp |  616 +
 src/core-impl/collections/db/sql/SqlCollection.h   |  213 +
 .../collections/db/sql/SqlCollectionFactory.cpp    |   40 +
 .../sql}/SqlCollectionFactory.h                    |    0
 .../collections/db/sql/SqlCollectionLocation.cpp   |  800 +
 .../collections/db/sql/SqlCollectionLocation.h     |  171 +
 src/core-impl/collections/db/sql/SqlMeta.cpp       | 2144 ++
 src/core-impl/collections/db/sql/SqlMeta.h         |  618 +
 src/core-impl/collections/db/sql/SqlQueryMaker.cpp | 1168 +
 src/core-impl/collections/db/sql/SqlQueryMaker.h   |  136 +
 .../collections/db/sql/SqlQueryMakerInternal.cpp   |  245 +
 .../collections/db/sql/SqlQueryMakerInternal.h     |   72 +
 .../collections/db/sql/SqlReadLabelCapability.cpp  |   94 +
 .../collections/db/sql/SqlReadLabelCapability.h    |   60 +
 src/core-impl/collections/db/sql/SqlRegistry.cpp   |  935 +
 src/core-impl/collections/db/sql/SqlRegistry.h     |  248 +
 src/core-impl/collections/db/sql/SqlRegistry_p.cpp |  344 +
 src/core-impl/collections/db/sql/SqlRegistry_p.h   |   98 +
 .../collections/db/sql/SqlScanResultProcessor.cpp  |  461 +
 .../collections/db/sql/SqlScanResultProcessor.h    |  112 +
 .../collections/db/sql/SqlWriteLabelCapability.cpp |   86 +
 .../collections/db/sql/SqlWriteLabelCapability.h   |   44 +
 .../sql}/XesamCollectionBuilder.cpp                |    0
 .../sql}/XesamCollectionBuilder.h                  |    0
 .../{sqlcollection => db/sql}/XesamDbus.cpp        |    0
 .../{sqlcollection => db/sql}/XesamDbus.h          |    0
 .../{sqlcollection => db/sql}/XesamInterface.xml   |    0
 .../sql}/amarok_sqlcollection_export.h             |    0
 .../collections/db/sql/device/CMakeLists.txt       |    7 +
 .../db/sql/device/massstorage/CMakeLists.txt       |   24 +
 .../massstorage/MassStorageDeviceHandler.cpp       |  205 +
 .../device/massstorage/MassStorageDeviceHandler.h  |   77 +
 .../massstorage/amarok_device_massstorage.desktop  |  133 +
 .../collections/db/sql/device/nfs/CMakeLists.txt   |   26 +
 .../db/sql/device/nfs/NfsDeviceHandler.cpp         |  220 +
 .../db/sql/device/nfs/NfsDeviceHandler.h           |   74 +
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |  129 +
 .../collections/db/sql/device/smb/CMakeLists.txt   |   26 +
 .../db/sql/device/smb/SmbDeviceHandler.cpp         |  220 +
 .../db/sql/device/smb/SmbDeviceHandler.h           |   74 +
 .../db/sql/device/smb/amarok_device_smb.desktop    |  129 +
 .../sql}/mysql-shared/MySqlQueryMaker.cpp          |    0
 .../sql}/mysql-shared/MySqlQueryMaker.h            |    0
 .../db/sql/mysql-shared/MySqlStorage.cpp           |  320 +
 .../collections/db/sql/mysql-shared/MySqlStorage.h |   89 +
 .../db/sql/mysqlecollection/CMakeLists.txt         |   54 +
 .../mysqlecollection/MySqlEmbeddedCollection.cpp   |   41 +
 .../sql/mysqlecollection/MySqlEmbeddedCollection.h |   46 +
 .../sql/mysqlecollection/MySqlEmbeddedStorage.cpp  |  130 +
 .../db/sql/mysqlecollection/MySqlEmbeddedStorage.h |   44 +
 .../amarok_collection-mysqlecollection.desktop     |  126 +
 .../db/sql/mysqlservercollection/CMakeLists.txt    |   54 +
 .../MySqlServerCollection.cpp                      |  155 +
 .../mysqlservercollection/MySqlServerCollection.h  |   57 +
 ...amarok_collection-mysqlservercollection.desktop |  126 +
 .../collections/ipodcollection/CMakeLists.txt      |  129 +-
 .../collections/ipodcollection/IpodCollection.cpp  |    7 +-
 .../amarok_collection-ipodcollection.desktop       |   26 +-
 .../collections/ipodcollection/config-gdk.h.cmake  |    2 +-
 .../ipodcollection/handler/IpodHandler.cpp         |  215 +-
 .../ipodcollection/handler/IpodHandler.h           |   48 +-
 .../handler/capabilities/IpodArtworkCapability.cpp |    8 +-
 .../handler/capabilities/IpodArtworkCapability.h   |    4 +-
 .../capabilities/IpodPlaylistCapability.cpp        |    2 +-
 .../handler/capabilities/IpodReadCapability.cpp    |   16 +-
 .../handler/capabilities/IpodReadCapability.h      |    6 +-
 .../handler/capabilities/IpodWriteCapability.cpp   |   19 +-
 .../handler/capabilities/IpodWriteCapability.h     |    6 +-
 .../support/IpodConnectionAssistant.cpp            |  113 +-
 .../MediaDeviceCollection.cpp                      |   67 +-
 .../mediadevicecollection/MediaDeviceCollection.h  |   22 +-
 .../MediaDeviceCollectionCapability.cpp            |   47 -
 .../MediaDeviceCollectionCapability.h              |   43 -
 .../MediaDeviceCollectionLocation.cpp              |   11 +-
 .../MediaDeviceCollectionLocation.h                |    7 +-
 .../MediaDeviceDecoratorCapability.cpp             |   48 -
 .../MediaDeviceDecoratorCapability.h               |   44 -
 .../mediadevicecollection/MediaDeviceMeta.cpp      |  307 +-
 .../mediadevicecollection/MediaDeviceMeta.h        |   38 +-
 ...amarok_collection-mediadevicecollection.desktop |   24 +-
 .../handler/MediaDeviceHandler.cpp                 |  215 +-
 .../handler/MediaDeviceHandler.h                   |    3 -
 .../handler/MediaDeviceHandlerCapability.cpp       |   22 +-
 .../handler/MediaDeviceHandlerCapability.h         |   30 +-
 .../handler/capabilities/ArtworkCapability.cpp     |    2 +-
 .../handler/capabilities/ArtworkCapability.h       |    5 +-
 .../handler/capabilities/PlaylistCapability.h      |    3 +-
 .../handler/capabilities/ReadCapability.cpp        |    9 +
 .../handler/capabilities/ReadCapability.h          |    8 +-
 .../handler/capabilities/ReadCapabilityBase.h      |    2 +
 .../handler/capabilities/WriteCapability.cpp       |    8 +
 .../handler/capabilities/WriteCapability.h         |    7 +-
 .../handler/capabilities/WriteCapabilityBase.h     |    1 +
 .../playlist/MediaDevicePlaylist.h                 |    1 -
 .../playlist/MediaDeviceUserPlaylistProvider.cpp   |    2 +-
 .../playlist/MediaDeviceUserPlaylistProvider.h     |    6 +-
 .../collections/mtpcollection/CMakeLists.txt       |   59 +-
 .../collections/mtpcollection/MtpCollection.cpp    |    5 +-
 .../amarok_collection-mtpcollection.desktop        |   28 +-
 .../mtpcollection/handler/MtpHandler.cpp           |   63 +-
 .../collections/mtpcollection/handler/MtpHandler.h |    6 +-
 .../handler/capabilities/MtpPlaylistCapability.cpp |    2 +-
 .../handler/capabilities/MtpReadCapability.cpp     |   62 +-
 .../handler/capabilities/MtpReadCapability.h       |    7 +-
 .../handler/capabilities/MtpWriteCapability.cpp    |   11 +-
 .../handler/capabilities/MtpWriteCapability.h      |    5 +-
 .../collections/nepomukcollection/NepomukAlbum.cpp |   16 +-
 .../nepomukcollection/NepomukArtist.cpp            |   58 -
 .../collections/nepomukcollection/NepomukArtist.h  |   11 -
 .../nepomukcollection/NepomukCollection.cpp        |    2 +-
 .../nepomukcollection/NepomukComposer.cpp          |    6 -
 .../nepomukcollection/NepomukComposer.h            |    1 -
 .../collections/nepomukcollection/NepomukGenre.cpp |    6 -
 .../collections/nepomukcollection/NepomukGenre.h   |    5 +-
 .../nepomukcollection/NepomukQueryMaker.cpp        |   82 +-
 .../nepomukcollection/NepomukQueryMaker.h          |   20 +-
 .../nepomukcollection/NepomukRegistry.cpp          |    2 +-
 .../collections/nepomukcollection/NepomukTrack.cpp |   12 +-
 .../collections/nepomukcollection/NepomukTrack.h   |    6 +-
 .../collections/nepomukcollection/NepomukYear.cpp  |    6 -
 .../collections/nepomukcollection/NepomukYear.h    |    1 -
 .../amarok_collection-nepomukcollection.desktop    |    6 +-
 .../collections/playdarcollection/CMakeLists.txt   |   29 +
 .../playdarcollection/PlaydarCollection.cpp        |  372 +
 .../playdarcollection/PlaydarCollection.h          |  101 +
 .../collections/playdarcollection/PlaydarMeta.cpp  |  699 +
 .../collections/playdarcollection/PlaydarMeta.h    |  289 +
 .../playdarcollection/PlaydarQueryMaker.cpp        |  593 +
 .../playdarcollection/PlaydarQueryMaker.h          |  126 +
 .../amarok_collection-playdarcollection.desktop    |   92 +
 .../playdarcollection/support/Controller.cpp       |  204 +
 .../playdarcollection/support/Controller.h         |  158 +
 .../playdarcollection/support/ProxyResolver.cpp    |   93 +
 .../playdarcollection/support/ProxyResolver.h      |   61 +
 .../playdarcollection/support/QMFunctionTypes.h    |  195 +
 .../playdarcollection/support/Query.cpp            |  230 +
 .../collections/playdarcollection/support/Query.h  |  120 +
 .../proxycollection/ProxyCollection.cpp            |   33 +-
 .../collections/proxycollection/ProxyCollection.h  |   10 +-
 .../proxycollection/ProxyCollectionMeta.cpp        |   61 +-
 .../proxycollection/ProxyCollectionMeta.h          |   16 +-
 .../proxycollection/ProxyCollectionQueryMaker.cpp  |  161 +-
 .../proxycollection/ProxyCollectionQueryMaker.h    |   27 +-
 .../collections/sqlcollection/ArtistHelper.cpp     |   68 -
 .../collections/sqlcollection/CMakeLists.txt       |   82 -
 .../collections/sqlcollection/CapabilityDelegate.h |   78 -
 .../sqlcollection/CapabilityDelegateImpl.cpp       |  510 -
 .../sqlcollection/CapabilityDelegateImpl.h         |   80 -
 .../collections/sqlcollection/DatabaseUpdater.cpp  | 1207 -
 .../collections/sqlcollection/DatabaseUpdater.h    |   87 -
 .../sqlcollection/MountPointManager.cpp            |  637 -
 .../collections/sqlcollection/MountPointManager.h  |  253 -
 .../collections/sqlcollection/ScanManager.cpp      |  917 -
 .../collections/sqlcollection/ScanManager.h        |  126 -
 .../sqlcollection/ScanResultProcessor.cpp          | 1601 --
 .../sqlcollection/ScanResultProcessor.h            |  190 -
 .../sqlcollection/SqlBookmarkThisCapability.cpp    |   45 -
 .../sqlcollection/SqlBookmarkThisCapability.h      |   50 -
 .../collections/sqlcollection/SqlCollection.cpp    |  434 -
 .../collections/sqlcollection/SqlCollection.h      |  184 -
 .../sqlcollection/SqlCollectionDBusHandler.cpp     |   46 -
 .../sqlcollection/SqlCollectionDBusHandler.h       |   44 -
 .../sqlcollection/SqlCollectionFactory.cpp         |  193 -
 .../sqlcollection/SqlCollectionLocation.cpp        |  760 -
 .../sqlcollection/SqlCollectionLocation.h          |  164 -
 .../sqlcollection/SqlImportedPlaylistProvider.cpp  |   24 -
 .../sqlcollection/SqlImportedPlaylistProvider.h    |   37 -
 .../collections/sqlcollection/SqlMeta.cpp          | 1930 --
 src/core-impl/collections/sqlcollection/SqlMeta.h  |  550 -
 .../collections/sqlcollection/SqlQueryMaker.cpp    | 1170 -
 .../collections/sqlcollection/SqlQueryMaker.h      |  145 -
 .../sqlcollection/SqlQueryMakerInternal.cpp        |  276 -
 .../sqlcollection/SqlQueryMakerInternal.h          |   74 -
 .../sqlcollection/SqlReadLabelCapability.cpp       |   94 -
 .../sqlcollection/SqlReadLabelCapability.h         |   60 -
 .../collections/sqlcollection/SqlRegistry.cpp      |  483 -
 .../collections/sqlcollection/SqlRegistry.h        |  103 -
 .../sqlcollection/SqlWriteLabelCapability.cpp      |   86 -
 .../sqlcollection/SqlWriteLabelCapability.h        |   44 -
 .../sqlcollection/device/CMakeLists.txt            |    5 -
 .../device/massstorage/CMakeLists.txt              |   28 -
 .../massstorage/MassStorageDeviceHandler.cpp       |  196 -
 .../device/massstorage/MassStorageDeviceHandler.h  |   75 -
 .../massstorage/amarok_massstorage-device.desktop  |  122 -
 .../sqlcollection/device/nfs/CMakeLists.txt        |   20 -
 .../sqlcollection/device/nfs/NfsDeviceHandler.cpp  |  164 -
 .../sqlcollection/device/nfs/NfsDeviceHandler.h    |   68 -
 .../device/nfs/amarok_nfs-device.desktop           |  119 -
 .../sqlcollection/device/smb/CMakeLists.txt        |   20 -
 .../sqlcollection/device/smb/SmbDeviceHandler.cpp  |  167 -
 .../sqlcollection/device/smb/SmbDeviceHandler.h    |   68 -
 .../device/smb/amarok_smb-device.desktop           |  119 -
 .../sqlcollection/mysql-shared/MySqlStorage.cpp    |  292 -
 .../sqlcollection/mysql-shared/MySqlStorage.h      |   75 -
 .../sqlcollection/mysqlecollection/CMakeLists.txt  |   53 -
 .../mysqlecollection/MySqlEmbeddedCollection.cpp   |   41 -
 .../mysqlecollection/MySqlEmbeddedCollection.h     |   42 -
 .../mysqlecollection/MySqlEmbeddedStorage.cpp      |  128 -
 .../mysqlecollection/MySqlEmbeddedStorage.h        |   39 -
 .../amarok_collection-mysqlecollection.desktop     |  111 -
 .../mysqlservercollection/CMakeLists.txt           |   53 -
 .../MySqlServerCollection.cpp                      |  154 -
 .../mysqlservercollection/MySqlServerCollection.h  |   53 -
 ...amarok_collection-mysqlservercollection.desktop |  111 -
 .../sqlcollection/org.kde.amarok.SqlCollection.xml |    9 -
 src/core-impl/collections/support/ArtistHelper.cpp |   68 +
 .../{sqlcollection => support}/ArtistHelper.h      |    0
 .../support/CollectionLocationDelegateImpl.cpp     |   40 +-
 .../support/CollectionLocationDelegateImpl.h       |    1 +
 .../collections/support/CollectionManager.cpp      |  216 +-
 .../collections/support/CollectionManager.h        |   18 +-
 src/core-impl/collections/support/Expression.cpp   |  198 +
 src/core-impl/collections/support/Expression.h     |   69 +
 .../collections/support/FileCollectionLocation.cpp |   34 +-
 .../collections/support/FileCollectionLocation.h   |    1 -
 .../collections/support/MemoryCollection.h         |    4 +-
 src/core-impl/collections/support/MemoryFilter.cpp |  552 +-
 src/core-impl/collections/support/MemoryFilter.h   |  231 +-
 .../collections/support/MemoryMatcher.cpp          |   61 +-
 src/core-impl/collections/support/MemoryMatcher.h  |    5 +-
 src/core-impl/collections/support/MemoryMeta.h     |  301 +
 .../collections/support/MemoryQueryMaker.cpp       |  112 +-
 .../collections/support/MemoryQueryMaker.h         |    9 +-
 .../support/MemoryQueryMakerInternal.cpp           |   97 +-
 .../collections/support/MemoryQueryMakerInternal.h |   26 +-
 .../support/PlaylistCollectionLocation.cpp         |    4 +-
 .../support/PlaylistCollectionLocation.h           |    3 +-
 .../collections/support/TextualQueryFilter.cpp     |  325 +
 .../collections/support/TextualQueryFilter.h       |   49 +
 .../support/TrashCollectionLocation.cpp            |  142 +
 .../collections/support/TrashCollectionLocation.h  |   58 +
 .../collections/support/XmlQueryReader.cpp         |   79 +-
 src/core-impl/collections/support/XmlQueryReader.h |    1 -
 .../collections/support/XmlQueryWriter.cpp         |  164 +-
 src/core-impl/collections/support/XmlQueryWriter.h |   10 +-
 .../collections/umscollection/CMakeLists.txt       |   20 +-
 .../collections/umscollection/UmsCollection.cpp    |  610 +-
 .../collections/umscollection/UmsCollection.h      |  131 +-
 .../umscollection/UmsCollectionLocation.cpp        |  224 +
 .../umscollection/UmsCollectionLocation.h          |   89 +
 .../collections/umscollection/UmsConfiguration.ui  |  291 +-
 .../amarok_collection-umscollection.desktop        |   23 +-
 .../umscollection/handler/UmsHandler.cpp           | 1144 -
 .../collections/umscollection/handler/UmsHandler.h |  301 -
 .../handler/capabilities/UmsArtworkCapability.cpp  |   42 -
 .../handler/capabilities/UmsArtworkCapability.h    |   48 -
 .../handler/capabilities/UmsPlaylistCapability.cpp |  120 -
 .../handler/capabilities/UmsPlaylistCapability.h   |   61 -
 .../handler/capabilities/UmsPodcastCapability.cpp  |   73 -
 .../handler/capabilities/UmsPodcastCapability.h    |   47 -
 .../handler/capabilities/UmsReadCapability.cpp     |  106 -
 .../handler/capabilities/UmsReadCapability.h       |   63 -
 .../handler/capabilities/UmsWriteCapability.cpp    |   82 -
 .../handler/capabilities/UmsWriteCapability.h      |   58 -
 .../umscollection/podcasts/UmsPodcastMeta.cpp      |   10 +
 .../umscollection/podcasts/UmsPodcastProvider.cpp  |   53 +-
 .../umscollection/podcasts/UmsPodcastProvider.h    |    8 +-
 .../support/UmsConnectionAssistant.cpp             |   88 -
 .../umscollection/support/UmsConnectionAssistant.h |   37 -
 .../umscollection/support/UmsDeviceInfo.cpp        |   37 -
 .../umscollection/support/UmsDeviceInfo.h          |   35 -
 src/core-impl/collections/upnp/CMakeLists.txt      |   29 -
 .../upnp/amarok_collection-upnpcollection.desktop  |  120 -
 .../collections/upnpcollection/CMakeLists.txt      |   47 +
 src/core-impl/collections/upnpcollection/NOTES     |    7 +
 .../upnpcollection/UpnpBrowseCollection.cpp        |  291 +
 .../upnpcollection/UpnpBrowseCollection.h          |  120 +
 .../collections/upnpcollection/UpnpCache.cpp       |  187 +
 .../collections/upnpcollection/UpnpCache.h         |   68 +
 .../upnpcollection/UpnpCollectionBase.cpp          |  129 +
 .../upnpcollection/UpnpCollectionBase.h            |   85 +
 .../upnpcollection/UpnpCollectionFactory.cpp       |  167 +
 .../upnpcollection/UpnpCollectionFactory.h         |   63 +
 .../upnpcollection/UpnpMemoryQueryMaker.cpp        |   50 +
 .../upnpcollection/UpnpMemoryQueryMaker.h          |   51 +
 .../collections/upnpcollection/UpnpMeta.cpp        |  630 +
 .../collections/upnpcollection/UpnpMeta.h          |  257 +
 .../collections/upnpcollection/UpnpQuery.cpp       |  106 +
 .../collections/upnpcollection/UpnpQuery.h         |   53 +
 .../collections/upnpcollection/UpnpQueryMaker.cpp  |  537 +
 .../collections/upnpcollection/UpnpQueryMaker.h    |  143 +
 .../upnpcollection/UpnpQueryMakerInternal.cpp      |  252 +
 .../upnpcollection/UpnpQueryMakerInternal.h        |   83 +
 .../upnpcollection/UpnpSearchCollection.cpp        |   85 +
 .../upnpcollection/UpnpSearchCollection.h          |   73 +
 .../amarok_collection-upnpcollection.desktop       |  128 +
 .../collections/upnpcollection/dbuscodec.cpp       |   90 +
 .../collections/upnpcollection/dbuscodec.h         |   38 +
 .../collections/upnpcollection/deviceinfo.h        |  143 +
 .../collections/upnpcollection/upnptypes.h         |  116 +
 src/core-impl/logger/ProxyLogger.cpp               |   63 +-
 src/core-impl/logger/ProxyLogger.h                 |   24 +-
 src/core-impl/meta/cdda/AudioCdTrackProvider_p.cpp |    4 +-
 src/core-impl/meta/cue/CueFileSupport.cpp          |   68 +-
 src/core-impl/meta/cue/CueFileSupport.h            |    7 +-
 src/core-impl/meta/default/DefaultMetaTypes.h      |   13 +-
 src/core-impl/meta/file/File.cpp                   |  223 +-
 src/core-impl/meta/file/File.h                     |   23 +-
 src/core-impl/meta/file/File_p.h                   |  336 +-
 src/core-impl/meta/file/TagLibUtils.cpp            |  271 -
 src/core-impl/meta/file/TagLibUtils.h              |   41 -
 src/core-impl/meta/multi/MultiTrack.h              |    4 +-
 src/core-impl/meta/proxy/MetaProxy.cpp             |   48 +-
 src/core-impl/meta/proxy/MetaProxy.h               |    8 +-
 src/core-impl/meta/proxy/MetaProxy_p.h             |   48 +-
 src/core-impl/meta/stream/Stream.cpp               |   20 +-
 src/core-impl/meta/stream/Stream.h                 |    3 +-
 src/core-impl/meta/stream/Stream_p.h               |   97 +-
 src/core-impl/meta/timecode/TimecodeMeta.cpp       |   78 +-
 src/core-impl/meta/timecode/TimecodeMeta.h         |   16 +-
 src/core-impl/meta/timecode/TimecodeObserver.cpp   |   72 +-
 src/core-impl/meta/timecode/TimecodeObserver.h     |   15 +-
 .../providers/user/UserPlaylistProvider.h          |   12 +-
 .../playlists/types/file/PlaylistFile.cpp          |   35 +
 src/core-impl/playlists/types/file/PlaylistFile.h  |    7 +-
 .../playlists/types/file/PlaylistFileSupport.cpp   |   47 +-
 .../playlists/types/file/PlaylistFileSupport.h     |    5 +-
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |  151 +-
 .../playlists/types/file/m3u/M3UPlaylist.h         |   10 +-
 .../playlists/types/file/pls/PLSPlaylist.cpp       |   88 +-
 .../playlists/types/file/pls/PLSPlaylist.h         |   13 +-
 .../playlists/types/file/xspf/XSPFPlaylist.cpp     |  295 +-
 .../playlists/types/file/xspf/XSPFPlaylist.h       |   12 +-
 .../sql/PodcastFilenameLayoutConfigDialog.cpp      |   82 +
 .../sql/PodcastFilenameLayoutConfigDialog.h        |   48 +
 .../sql/PodcastFilenameLayoutConfigWidget.ui       |  133 +
 src/core-impl/podcasts/sql/PodcastSettingsBase.ui  |   29 +-
 .../podcasts/sql/PodcastSettingsDialog.cpp         |    9 +
 src/core-impl/podcasts/sql/PodcastSettingsDialog.h |    1 +
 src/core-impl/podcasts/sql/SqlPodcastMeta.cpp      |  210 +-
 src/core-impl/podcasts/sql/SqlPodcastMeta.h        |   22 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.cpp  |  553 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.h    |   31 +-
 .../sql/SqlPodcastProviderSettingsWidget.ui        |    8 +-
 src/core/CMakeLists.txt                            |   35 +-
 src/core/capabilities/ActionsCapability.cpp        |   43 +
 src/core/capabilities/ActionsCapability.h          |   77 +
 src/core/capabilities/BookmarkThisCapability.cpp   |    7 +-
 src/core/capabilities/BookmarkThisCapability.h     |   20 +-
 src/core/capabilities/Capability.h                 |   19 +-
 src/core/capabilities/CollectionCapability.cpp     |   23 -
 src/core/capabilities/CollectionCapability.h       |   44 -
 .../capabilities/CollectionImportCapability.cpp    |   26 +
 src/core/capabilities/CollectionImportCapability.h |   64 +
 src/core/capabilities/CollectionScanCapability.cpp |   26 +
 src/core/capabilities/CollectionScanCapability.h   |   69 +
 .../capabilities/CurrentTrackActionsCapability.cpp |   30 -
 .../capabilities/CurrentTrackActionsCapability.h   |   58 -
 src/core/capabilities/CustomActionsCapability.cpp  |   44 -
 src/core/capabilities/CustomActionsCapability.h    |   73 -
 src/core/capabilities/DecoratorCapability.cpp      |   23 -
 src/core/capabilities/DecoratorCapability.h        |   43 -
 src/core/capabilities/EditCapability.h             |    6 +-
 src/core/capabilities/FindInSourceCapability.cpp   |    1 +
 src/core/capabilities/FindInSourceCapability.h     |   20 +-
 src/core/capabilities/ReadLabelCapability.cpp      |   32 +-
 src/core/capabilities/ReadLabelCapability.h        |   34 +-
 src/core/capabilities/StatisticsCapability.h       |    6 +-
 src/core/capabilities/WriteLabelCapability.cpp     |   33 +-
 src/core/capabilities/WriteLabelCapability.h       |   32 +-
 src/core/collections/Collection.cpp                |    4 +-
 src/core/collections/Collection.h                  |   32 +-
 src/core/collections/CollectionLocation.cpp        |  123 +-
 src/core/collections/CollectionLocation.h          |   76 +-
 src/core/collections/CollectionLocationDelegate.h  |    1 +
 src/core/collections/MetaQueryMaker.cpp            |  109 +-
 src/core/collections/MetaQueryMaker.h              |   10 +-
 src/core/collections/QueryMaker.cpp                |    9 +-
 src/core/collections/QueryMaker.h                  |  101 +-
 src/core/collections/support/SqlStorage.h          |   14 +-
 src/core/engine/EngineObserver.cpp                 |  262 -
 src/core/engine/EngineObserver.h                   |  205 -
 src/core/interfaces/Logger.h                       |   27 +-
 src/core/meta/Meta.cpp                             |  143 +-
 src/core/meta/Meta.h                               |  153 +-
 src/core/meta/support/MetaConstants.cpp            |  436 +
 src/core/meta/support/MetaConstants.h              |   84 +-
 src/core/meta/support/MetaKeys.cpp                 |   66 +
 src/core/meta/support/MetaKeys.h                   |  100 +
 src/core/meta/support/MetaUtility.cpp              |  188 +-
 src/core/meta/support/MetaUtility.h                |   73 +-
 src/core/playlists/Playlist.h                      |   15 +
 src/core/playlists/PlaylistProvider.h              |    8 +-
 src/core/plugins/Plugin.cpp                        |   53 -
 src/core/plugins/Plugin.h                          |   68 -
 src/core/plugins/PluginConfig.cpp                  |   19 -
 src/core/plugins/PluginConfig.h                    |   60 -
 src/core/plugins/PluginManager.cpp                 |  233 -
 src/core/plugins/PluginManager.h                   |  118 -
 src/core/podcasts/PodcastImageFetcher.cpp          |   15 +-
 src/core/podcasts/PodcastImageFetcher.h            |    4 +-
 src/core/podcasts/PodcastMeta.cpp                  |   14 +
 src/core/podcasts/PodcastMeta.h                    |   57 +-
 src/core/podcasts/PodcastProvider.cpp              |   23 +-
 src/core/podcasts/PodcastProvider.h                |   24 +-
 src/core/support/Amarok.cpp                        |  180 +-
 src/core/support/Amarok.h                          |   62 +-
 src/core/support/Components.cpp                    |    7 +-
 src/core/support/Components.h                      |    8 +
 src/core/support/Debug.cpp                         |  230 +-
 src/core/support/Debug.h                           |  273 +-
 src/core/support/Debug_p.h                         |   37 +
 src/core/support/PluginFactory.cpp                 |   48 +
 src/core/support/PluginFactory.h                   |   64 +
 src/core/support/SmartPointerList.h                |    2 +-
 src/core/transcoding/TranscodingConfiguration.cpp  |   41 +
 src/core/transcoding/TranscodingConfiguration.h    |   53 +
 src/core/transcoding/TranscodingController.cpp     |   77 +
 src/core/transcoding/TranscodingController.h       |   63 +
 src/core/transcoding/TranscodingDefines.h          |   37 +
 src/core/transcoding/TranscodingFormat.h           |  111 +
 src/core/transcoding/TranscodingProperty.cpp       |  116 +
 src/core/transcoding/TranscodingProperty.h         |  135 +
 .../transcoding/formats/TranscodingAacFormat.cpp   |  120 +
 .../transcoding/formats/TranscodingAacFormat.h     |   48 +
 .../transcoding/formats/TranscodingAlacFormat.cpp  |   67 +
 .../transcoding/formats/TranscodingAlacFormat.h    |   42 +
 .../transcoding/formats/TranscodingFlacFormat.cpp  |   96 +
 .../transcoding/formats/TranscodingFlacFormat.h    |   42 +
 .../transcoding/formats/TranscodingMp3Format.cpp   |  111 +
 .../transcoding/formats/TranscodingMp3Format.h     |   45 +
 .../transcoding/formats/TranscodingNullFormat.cpp  |   61 +
 .../transcoding/formats/TranscodingNullFormat.h    |   42 +
 .../formats/TranscodingVorbisFormat.cpp            |  117 +
 .../transcoding/formats/TranscodingVorbisFormat.h  |   42 +
 .../transcoding/formats/TranscodingWmaFormat.cpp   |  122 +
 .../transcoding/formats/TranscodingWmaFormat.h     |   47 +
 src/covermanager/CoverCache.cpp                    |  141 +
 src/covermanager/CoverCache.h                      |   88 +
 src/covermanager/CoverFetchQueue.h                 |    2 +-
 src/covermanager/CoverFetchUnit.cpp                |   27 +-
 src/covermanager/CoverFetchUnit.h                  |    5 +-
 src/covermanager/CoverFetcher.cpp                  |  156 +-
 src/covermanager/CoverFetcher.h                    |   21 +-
 src/covermanager/CoverFetchingActions.cpp          |   52 +-
 src/covermanager/CoverFoundDialog.cpp              |  231 +-
 src/covermanager/CoverFoundDialog.h                |   38 +-
 src/covermanager/CoverManager.cpp                  |   50 +-
 src/covermanager/CoverManager.h                    |    4 +-
 src/covermanager/CoverViewDialog.cpp               |   90 +
 src/covermanager/CoverViewDialog.h                 |   52 +-
 src/data/amarok.notifyrc                           |   24 +-
 src/data/ball.png                                  |  Bin 1619 -> 0 bytes
 src/data/dot.png                                   |  Bin 598 -> 0 bytes
 src/data/grid.png                                  |  Bin 233 -> 0 bytes
 src/data/wirl1.png                                 |  Bin 46301 -> 0 bytes
 src/data/wirl2.png                                 |  Bin 44081 -> 0 bytes
 src/databaseimporter/DatabaseImporter.cpp          |   16 +-
 src/databaseimporter/DatabaseImporter.h            |   16 -
 .../amarok14/FastForwardImporter.cpp               |    1 +
 .../amarok14/FastForwardImporter.h                 |    2 -
 .../amarok14/FastForwardImporterConfig.cpp         |   11 +-
 .../amarok14/FastForwardWorker.cpp                 |   52 +-
 src/databaseimporter/amarok14/FastForwardWorker.h  |    6 +-
 .../itunes/ITunesImporterWorker.cpp                |   26 +-
 src/databaseimporter/sqlbatch/SqlBatchImporter.cpp |   81 +
 src/databaseimporter/sqlbatch/SqlBatchImporter.h   |   45 +
 .../sqlbatch/SqlBatchImporterConfig.cpp            |   62 +
 .../sqlbatch/SqlBatchImporterConfig.h              |   43 +
 src/dbus/DBusQueryHelper.cpp                       |    7 +-
 src/dbus/DBusQueryHelper.h                         |    4 +-
 src/dbus/PlayerDBusHandler.cpp                     |  280 -
 src/dbus/PlayerDBusHandler.h                       |  115 -
 src/dbus/RootDBusHandler.cpp                       |   77 -
 src/dbus/RootDBusHandler.h                         |   51 -
 src/dbus/TracklistDBusHandler.cpp                  |  122 -
 src/dbus/TracklistDBusHandler.h                    |   53 -
 src/dbus/mpris1/PlayerHandler.cpp                  |  283 +
 src/dbus/mpris1/PlayerHandler.h                    |  117 +
 src/dbus/mpris1/RootHandler.cpp                    |   92 +
 src/dbus/mpris1/RootHandler.h                      |   54 +
 src/dbus/mpris1/TrackListHandler.cpp               |  122 +
 src/dbus/mpris1/TrackListHandler.h                 |   53 +
 .../mpris1/org.freedesktop.MediaPlayer.player.xml  |  115 +
 .../mpris1/org.freedesktop.MediaPlayer.root.xml    |   20 +
 .../org.freedesktop.MediaPlayer.tracklist.xml      |    0
 .../org.kde.amarok.Mpris1Extensions.Player.xml     |   34 +
 src/dbus/mpris2/Mpris2DBusHandler.cpp              |  514 +
 src/dbus/mpris2/Mpris2DBusHandler.h                |  196 +
 .../org.kde.amarok.Mpris2Extensions.Player.xml     |   22 +
 src/dbus/mpris2/org.mpris.MediaPlayer2.Player.xml  |   91 +
 src/dbus/mpris2/org.mpris.MediaPlayer2.root.xml    |   25 +
 src/dbus/org.freedesktop.MediaPlayer.player.xml    |  105 -
 src/dbus/org.freedesktop.MediaPlayer.root.xml      |   20 -
 src/dbus/org.kde.amarok.App.xml                    |   16 +
 src/dialogs/CollectionSetup.cpp                    |  174 +-
 src/dialogs/CollectionSetup.h                      |   21 +-
 src/dialogs/DatabaseImporterDialog.cpp             |   42 +-
 src/dialogs/EditFilterDialog.cpp                   |  812 +-
 src/dialogs/EditFilterDialog.h                     |   82 +-
 src/dialogs/EditFilterDialog.ui                    |  736 +-
 src/dialogs/EqualizerDialog.cpp                    |  186 +-
 src/dialogs/EqualizerDialog.h                      |   16 +-
 src/dialogs/FilenameLayoutDialog.cpp               |  698 +-
 src/dialogs/FilenameLayoutDialog.h                 |   76 +-
 src/dialogs/FilenameLayoutDialog.ui                |  860 +-
 src/dialogs/LabelListModel.cpp                     |    2 +-
 src/dialogs/LabelListModel.h                       |    2 +-
 src/dialogs/MusicBrainzTagger.cpp                  |  157 +
 src/dialogs/MusicBrainzTagger.h                    |   78 +
 src/dialogs/MusicBrainzTagger.ui                   |   85 +
 src/dialogs/OrganizeCollectionDialog.cpp           |  300 +-
 src/dialogs/OrganizeCollectionDialog.h             |   32 +-
 src/dialogs/OrganizeCollectionDialogBase.ui        |  301 +-
 src/dialogs/ScriptManager.cpp                      |  805 -
 src/dialogs/ScriptManager.h                        |  171 -
 src/dialogs/ScriptManagerBase.ui                   |  142 -
 src/dialogs/ScriptSelector.cpp                     |   28 +-
 src/dialogs/ScriptSelector.h                       |    6 +-
 src/dialogs/ScriptUpdater.cpp                      |  271 -
 src/dialogs/ScriptUpdater.h                        |   64 -
 src/dialogs/TagDialog.cpp                          | 1895 +-
 src/dialogs/TagDialog.h                            |  184 +-
 src/dialogs/TagDialogBase.ui                       | 1241 +-
 src/dialogs/TagGuesser.cpp                         |  262 +-
 src/dialogs/TagGuesser.h                           |   60 +-
 src/dialogs/TrackOrganizer.cpp                     |   89 +-
 src/dialogs/TrackOrganizer.h                       |   25 +-
 src/dialogs/deviceconfiguredialog.cpp              |    6 +-
 src/dialogs/deviceconfiguredialog.h                |   11 +-
 src/dynamic/Bias.cpp                               |  871 +-
 src/dynamic/Bias.h                                 |  469 +-
 src/dynamic/BiasFactory.cpp                        |  299 +
 src/dynamic/BiasFactory.h                          |  140 +
 src/dynamic/BiasSolver.cpp                         |  810 +-
 src/dynamic/BiasSolver.h                           |  187 +-
 src/dynamic/BiasedPlaylist.cpp                     |  226 +-
 src/dynamic/BiasedPlaylist.h                       |   50 +-
 src/dynamic/CustomBias.cpp                         |  284 -
 src/dynamic/CustomBias.h                           |  116 -
 src/dynamic/CustomBiasEntry.cpp                    |   25 -
 src/dynamic/CustomBiasEntry.h                      |   97 -
 src/dynamic/CustomBiasEntryFactory.h               |   68 -
 src/dynamic/CustomBiasEntryWidget.cpp              |  196 -
 src/dynamic/CustomBiasEntryWidget.h                |   61 -
 src/dynamic/DynamicModel.cpp                       | 1146 +
 src/dynamic/DynamicModel.h                         |  189 +
 src/dynamic/DynamicPlaylist.cpp                    |   46 +-
 src/dynamic/DynamicPlaylist.h                      |   52 +-
 src/dynamic/TrackSet.cpp                           |  217 +-
 src/dynamic/TrackSet.h                             |   81 +-
 src/dynamic/biases/AlbumPlayBias.cpp               |  291 +
 src/dynamic/biases/AlbumPlayBias.h                 |   88 +
 src/dynamic/biases/EchoNest.cpp                    |  529 -
 src/dynamic/biases/EchoNest.h                      |  130 -
 src/dynamic/biases/EchoNestBias.cpp                |  531 +
 src/dynamic/biases/EchoNestBias.h                  |  125 +
 src/dynamic/biases/IfElseBias.cpp                  |  183 +
 src/dynamic/biases/IfElseBias.h                    |   84 +
 src/dynamic/biases/PartBias.cpp                    |  623 +
 src/dynamic/biases/PartBias.h                      |  150 +
 src/dynamic/biases/QuizPlayBias.cpp                |  359 +
 src/dynamic/biases/QuizPlayBias.h                  |  100 +
 src/dynamic/biases/SearchQueryBias.cpp             |  174 +
 src/dynamic/biases/SearchQueryBias.h               |   78 +
 src/dynamic/biases/TagMatchBias.cpp                |  521 +
 src/dynamic/biases/TagMatchBias.h                  |  163 +
 src/dynamic/gsl/gauss.c                            |  353 -
 src/equalizer/EqualizerPresets.cpp                 |  242 +
 src/equalizer/EqualizerPresets.h                   |   46 +
 src/images/CMakeLists.txt                          |   28 +-
 src/images/emblem-amazon-scalable.svgz             |  Bin 0 -> 1647 bytes
 src/images/emblem-amazon.png                       |  Bin 0 -> 630 bytes
 src/images/emblem-gpodder-scalable.svgz            |  Bin 0 -> 6820 bytes
 src/images/emblem-gpodder.png                      |  Bin 0 -> 983 bytes
 src/images/icons/hi16-action-amarok_cart_add.png   |  Bin 0 -> 649 bytes
 .../icons/hi16-action-amarok_cart_remove.png       |  Bin 0 -> 634 bytes
 src/images/icons/hi16-action-amarok_cart_view.png  |  Bin 0 -> 483 bytes
 .../hi16-action-lastfm-loved-radio-amarok.png      |  Bin 936 -> 0 bytes
 .../icons/hi16-action-lastfm-mix-radio-amarok.png  |  Bin 0 -> 865 bytes
 .../hi16-action-view-services-amazon-amarok.png    |  Bin 0 -> 523 bytes
 .../hi16-action-view-services-gpodder-amarok.png   |  Bin 0 -> 983 bytes
 src/images/icons/hi22-action-amarok_cart_add.png   |  Bin 0 -> 769 bytes
 .../icons/hi22-action-amarok_cart_remove.png       |  Bin 0 -> 693 bytes
 src/images/icons/hi22-action-amarok_cart_view.png  |  Bin 0 -> 575 bytes
 .../hi22-action-view-services-amazon-amarok.png    |  Bin 0 -> 633 bytes
 .../hi22-action-view-services-gpodder-amarok.png   |  Bin 0 -> 1569 bytes
 src/images/icons/hi32-action-amarok_cart_add.png   |  Bin 0 -> 1688 bytes
 .../icons/hi32-action-amarok_cart_remove.png       |  Bin 0 -> 1681 bytes
 src/images/icons/hi32-action-amarok_cart_view.png  |  Bin 0 -> 1278 bytes
 .../hi32-action-view-services-amazon-amarok.png    |  Bin 0 -> 1008 bytes
 .../hi32-action-view-services-gpodder-amarok.png   |  Bin 0 -> 2825 bytes
 src/images/icons/hi48-action-amarok_cart_add.png   |  Bin 0 -> 2475 bytes
 .../icons/hi48-action-amarok_cart_remove.png       |  Bin 0 -> 2524 bytes
 src/images/icons/hi48-action-amarok_cart_view.png  |  Bin 0 -> 2012 bytes
 .../icons/hi48-action-filename-and-amarok.png      |  Bin 0 -> 1894 bytes
 src/images/icons/hi48-action-label-amarok.png      |  Bin 0 -> 2604 bytes
 .../hi48-action-view-services-amazon-amarok.png    |  Bin 0 -> 1474 bytes
 .../hi48-action-view-services-gpodder-amarok.png   |  Bin 0 -> 4990 bytes
 src/images/icons/svg/action-cart_add.svgz          |  Bin 0 -> 7442 bytes
 src/images/icons/svg/action-cart_remove.svgz       |  Bin 0 -> 8072 bytes
 src/images/icons/svg/action-cart_view.svg          |  864 +
 .../svg/action-view-services-amazon-amarok.svgz    |  Bin 0 -> 11090 bytes
 .../svg/action-view-services-gpodder-amarok.svgz   |  Bin 0 -> 6820 bytes
 src/images/mb_aicon.png                            |  Bin 0 -> 639 bytes
 src/images/mb_licon.png                            |  Bin 0 -> 784 bytes
 src/images/mb_ticon.png                            |  Bin 0 -> 261 bytes
 src/images/splash-screen.png                       |  Bin 0 -> 198970 bytes
 src/images/splash_screen.jpg                       |  Bin 54375 -> 67777 bytes
 src/kconf_update/CMakeLists.txt                    |    5 +
 .../amarok-2.4.1-tokens_syntax_update.pl           |   38 +
 src/kconf_update/amarok.upd                        |    4 +
 src/likeback/LikeBack.cpp                          |   24 +-
 src/likeback/LikeBackBar.cpp                       |   26 +-
 src/likeback/LikeBackDialog.cpp                    |   24 +-
 src/mac/GrowlInterface.cpp                         |   47 +-
 src/mac/GrowlInterface.h                           |   30 +-
 src/main.cpp                                       |  126 +-
 src/metaquerywidget.h                              |   20 +
 src/moodbar/MoodbarManager.cpp                     |   66 +-
 src/moodbar/MoodbarManager.h                       |   16 +-
 src/musicbrainz/MusicBrainzFinder.cpp              |  504 +
 src/musicbrainz/MusicBrainzFinder.h                |   90 +
 src/musicbrainz/MusicBrainzMeta.h                  |   38 +
 src/musicbrainz/MusicBrainzTags.cpp                |  783 +
 src/musicbrainz/MusicBrainzTags.h                  |  135 +
 src/musicbrainz/MusicBrainzXmlParser.cpp           |  393 +
 src/musicbrainz/MusicBrainzXmlParser.h             |   71 +
 src/musicbrainz/MusicDNSAudioDecoder.cpp           |  262 +
 src/musicbrainz/MusicDNSAudioDecoder.h             |   73 +
 src/musicbrainz/MusicDNSFinder.cpp                 |  219 +
 src/musicbrainz/MusicDNSFinder.h                   |   79 +
 src/musicbrainz/MusicDNSXmlParser.cpp              |  114 +
 src/musicbrainz/MusicDNSXmlParser.h                |   46 +
 src/network/NetworkAccessManagerProxy.cpp          |  158 +-
 src/network/NetworkAccessManagerProxy.h            |   26 +-
 src/playlist/PlaylistActions.cpp                   |  170 +-
 src/playlist/PlaylistActions.h                     |   35 +-
 src/playlist/PlaylistBreadcrumbItem.cpp            |    6 +-
 src/playlist/PlaylistBreadcrumbItemSortButton.cpp  |    1 -
 src/playlist/PlaylistBreadcrumbLevel.cpp           |    5 +-
 src/playlist/PlaylistColumnNames.cpp               |   71 +
 src/playlist/PlaylistColumnNames.h                 |   52 +
 src/playlist/PlaylistController.cpp                |  127 +-
 src/playlist/PlaylistController.h                  |   42 +-
 src/playlist/PlaylistDefines.h                     |   40 +-
 src/playlist/PlaylistDock.cpp                      |  188 +-
 src/playlist/PlaylistDock.h                        |   35 +-
 src/playlist/PlaylistInfoWidget.cpp                |  116 +
 src/playlist/PlaylistInfoWidget.h                  |   34 +
 src/playlist/PlaylistItem.h                        |    5 +-
 src/playlist/PlaylistModel.cpp                     |  401 +-
 src/playlist/PlaylistModel.h                       |   23 +-
 src/playlist/PlaylistModelStack.cpp                |   24 +-
 src/playlist/PlaylistModelStack.h                  |   14 +-
 src/playlist/PlaylistQueueEditor.cpp               |  140 +
 src/playlist/PlaylistQueueEditor.h                 |   42 +
 src/playlist/PlaylistQueueEditor.ui                |  117 +
 src/playlist/PlaylistToolBar.cpp                   |  109 +
 src/playlist/PlaylistToolBar.h                     |   90 +
 src/playlist/PlaylistViewUrlRunner.cpp             |   17 +-
 src/playlist/ProgressiveSearchWidget.cpp           |   34 +-
 src/playlist/ProgressiveSearchWidget.h             |   11 +-
 src/playlist/layouts/LayoutEditDialog.cpp          |   60 +-
 src/playlist/layouts/LayoutEditDialog.h            |    4 +-
 src/playlist/layouts/LayoutEditWidget.cpp          |    3 +-
 src/playlist/layouts/LayoutManager.cpp             |    6 +-
 src/playlist/layouts/PlaylistLayoutEditDialog.cpp  |   63 +-
 src/playlist/navigators/AlbumNavigator.cpp         |    5 +-
 src/playlist/navigators/AlbumNavigator.h           |    2 +-
 src/playlist/navigators/DynamicTrackNavigator.cpp  |   83 +-
 src/playlist/navigators/DynamicTrackNavigator.h    |   26 +-
 .../navigators/FavoredRandomTrackNavigator.cpp     |    6 +-
 src/playlist/navigators/NavigatorConfigAction.cpp  |   58 +
 src/playlist/navigators/NavigatorConfigAction.h    |    3 +
 src/playlist/navigators/StandardTrackNavigator.cpp |   56 +-
 src/playlist/navigators/StandardTrackNavigator.h   |    2 +
 src/playlist/navigators/TrackNavigator.cpp         |   45 +-
 src/playlist/navigators/TrackNavigator.h           |   12 +-
 src/playlist/proxymodels/AbstractModel.h           |   13 +-
 src/playlist/proxymodels/GroupingProxy.cpp         |    8 +-
 src/playlist/proxymodels/ProxyBase.cpp             |  109 +-
 src/playlist/proxymodels/ProxyBase.h               |    6 +-
 src/playlist/proxymodels/SortAlgorithms.cpp        |  140 +-
 src/playlist/proxymodels/SortFilterProxy.h         |    6 +
 src/playlist/proxymodels/SortScheme.cpp            |    3 +-
 src/playlist/view/PlaylistViewCommon.cpp           |  178 +-
 src/playlist/view/PlaylistViewCommon.h             |   12 +-
 src/playlist/view/listview/InlineEditorWidget.cpp  |  239 +-
 src/playlist/view/listview/InlineEditorWidget.h    |   14 +-
 src/playlist/view/listview/PrettyItemDelegate.cpp  |  655 +-
 src/playlist/view/listview/PrettyItemDelegate.h    |   16 +-
 src/playlist/view/listview/PrettyListView.cpp      |  121 +-
 src/playlist/view/listview/PrettyListView.h        |    9 +-
 src/playlist/view/tooltips/AmarokToolTip.cpp       |   53 -
 src/playlist/view/tooltips/AmarokToolTip.h         |   47 -
 .../view/tooltips/KFormattedBalloonTipDelegate.cpp |  138 -
 .../view/tooltips/KFormattedBalloonTipDelegate.h   |   46 -
 src/playlist/view/tooltips/KToolTip.cpp            |  229 -
 src/playlist/view/tooltips/KToolTip.h              |   54 -
 src/playlist/view/tooltips/KToolTipDelegate.cpp    |  138 -
 src/playlist/view/tooltips/KToolTipDelegate.h      |  110 -
 src/playlist/view/tooltips/KToolTipItem.cpp        |   76 -
 src/playlist/view/tooltips/KToolTipItem.h          |   84 -
 src/playlist/view/tooltips/KToolTip_p.h            |   63 -
 src/playlist/view/tooltips/ToolTipManager.cpp      |  413 -
 src/playlist/view/tooltips/ToolTipManager.h        |  139 -
 src/playlistgenerator/Constraint.cpp               |    4 +-
 src/playlistgenerator/Constraint.h                 |    2 +-
 src/playlistgenerator/ConstraintFactory.cpp        |   10 +-
 src/playlistgenerator/ConstraintGroup.cpp          |  289 +-
 src/playlistgenerator/ConstraintGroup.h            |   32 +-
 src/playlistgenerator/ConstraintGroupEditWidget.ui |    3 -
 src/playlistgenerator/ConstraintNode.cpp           |   10 +-
 src/playlistgenerator/ConstraintNode.h             |   31 +-
 src/playlistgenerator/ConstraintSolver.cpp         |  436 +-
 src/playlistgenerator/ConstraintSolver.h           |   58 +-
 src/playlistgenerator/ConstraintTestWrapper.cpp    |   55 -
 src/playlistgenerator/ConstraintTestWrapper.h      |   44 -
 src/playlistgenerator/ConstraintTester.cpp         |  337 -
 src/playlistgenerator/ConstraintTester.h           |   85 -
 src/playlistgenerator/Preset.cpp                   |   24 +-
 src/playlistgenerator/PresetEditDialog.cpp         |    2 -
 src/playlistgenerator/PresetModel.cpp              |   46 +-
 src/playlistgenerator/PresetModel.h                |    4 +-
 src/playlistgenerator/TODO                         |    9 +-
 src/playlistgenerator/TreeModel.cpp                |    5 +-
 src/playlistgenerator/constraints/Checkpoint.cpp   |  331 +-
 src/playlistgenerator/constraints/Checkpoint.h     |   86 +-
 .../constraints/CheckpointEditWidget.ui            |    3 -
 .../constraints/CheckpointSupport.cpp              |  321 -
 src/playlistgenerator/constraints/Matching.cpp     |    2 +-
 src/playlistgenerator/constraints/Matching.h       |   10 +-
 .../constraints/PlaylistDuration.cpp               |  228 +
 .../constraints/PlaylistDuration.h                 |   93 +
 .../constraints/PlaylistDurationEditWidget.ui      |  168 +
 .../constraints/PlaylistLength.cpp                 |  194 +-
 src/playlistgenerator/constraints/PlaylistLength.h |   41 +-
 .../constraints/PlaylistLengthEditWidget.ui        |   42 +-
 .../constraints/PreventDuplicates.cpp              |  403 +-
 .../constraints/PreventDuplicates.h                |   96 +-
 .../constraints/PreventDuplicatesEditWidget.ui     |    3 -
 src/playlistgenerator/constraints/TagMatch.cpp     |  144 +-
 src/playlistgenerator/constraints/TagMatch.h       |   17 +-
 .../constraints/TagMatchComparer.cpp               |  167 +
 .../constraints/TagMatchEditWidget.ui              |    3 -
 .../constraints/TagMatchSupport.cpp                |    6 +-
 .../constraints/TrackSpreader.cpp                  |  314 +-
 src/playlistgenerator/constraints/TrackSpreader.h  |   68 +-
 src/playlistmanager/PlaylistManager.cpp            |  202 +-
 src/playlistmanager/PlaylistManager.h              |   40 +-
 src/playlistmanager/SyncRelationStorage.cpp        |   21 +
 src/playlistmanager/SyncRelationStorage.h          |   12 +-
 src/playlistmanager/SyncedPlaylist.cpp             |  179 +-
 src/playlistmanager/SyncedPlaylist.h               |   15 +-
 src/playlistmanager/SyncedPodcast.cpp              |   30 +
 src/playlistmanager/SyncedPodcast.h                |  103 +
 src/playlistmanager/file/KConfigSyncRelStore.cpp   |   68 +-
 src/playlistmanager/file/KConfigSyncRelStore.h     |   13 +-
 src/playlistmanager/file/PlaylistFileProvider.cpp  |  195 +-
 src/playlistmanager/file/PlaylistFileProvider.h    |   26 +-
 src/playlistmanager/sql/SqlPlaylist.cpp            |   43 +-
 src/playlistmanager/sql/SqlPlaylist.h              |    5 +-
 src/playlistmanager/sql/SqlPlaylistGroup.h         |    4 +
 .../sql/SqlUserPlaylistProvider.cpp                |   76 +-
 src/playlistmanager/sql/SqlUserPlaylistProvider.h  |    6 +
 src/scanner/GenericScanManager.cpp                 |  330 +
 src/scanner/GenericScanManager.h                   |  183 +
 src/scriptengine/AmarokCollectionScript.cpp        |   11 +-
 src/scriptengine/AmarokCollectionScript.h          |    2 +-
 src/scriptengine/AmarokEngineScript.cpp            |   91 +-
 src/scriptengine/AmarokEngineScript.h              |   56 +-
 src/scriptengine/AmarokInfoScript.cpp              |   23 +-
 src/scriptengine/AmarokInfoScript.h                |   12 +-
 src/scriptengine/AmarokKNotifyScript.cpp           |   68 +
 src/scriptengine/AmarokKNotifyScript.h             |   49 +
 src/scriptengine/AmarokLyricsScript.cpp            |   30 +-
 src/scriptengine/AmarokNetworkScript.cpp           |   57 +-
 src/scriptengine/AmarokNetworkScript.h             |   31 +-
 src/scriptengine/AmarokOSDScript.cpp               |    8 +-
 src/scriptengine/AmarokOSDScript.h                 |    2 +-
 src/scriptengine/AmarokPlaylistScript.cpp          |   11 +-
 src/scriptengine/AmarokPlaylistScript.h            |    3 +-
 src/scriptengine/AmarokScript.cpp                  |   27 +-
 src/scriptengine/AmarokScript.h                    |   14 +-
 src/scriptengine/AmarokScriptConfig.cpp            |   24 +-
 src/scriptengine/AmarokScriptConfig.h              |   10 +-
 src/scriptengine/AmarokScriptableServiceScript.cpp |   17 +-
 .../AmarokServicePluginManagerScript.cpp           |   23 +-
 .../AmarokServicePluginManagerScript.h             |    2 +-
 src/scriptengine/AmarokStatusbarScript.cpp         |   43 +-
 src/scriptengine/AmarokStatusbarScript.h           |   12 +-
 src/scriptengine/AmarokWindowScript.cpp            |   33 +-
 src/scriptengine/AmarokWindowScript.h              |   13 +-
 src/scriptengine/MetaTypeExporter.cpp              |   31 +-
 src/scriptengine/MetaTypeExporter.h                |   20 +-
 src/scriptengine/ScriptImporter.cpp                |   19 +-
 src/scriptengine/ScriptImporter.h                  |    2 +-
 src/scripts/librivox_service/main.js               |    2 +-
 src/scripts/radio_station_service/main.js          |    4 +-
 src/services/CMakeLists.txt                        |    6 +-
 src/services/DynamicServiceQueryMaker.cpp          |   24 -
 src/services/DynamicServiceQueryMaker.h            |   11 -
 src/services/InfoParserBase.cpp                    |    2 +-
 src/services/InfoParserBase.h                      |    2 +-
 src/services/ServiceAlbumCoverDownloader.cpp       |   92 +-
 src/services/ServiceAlbumCoverDownloader.h         |   12 +-
 src/services/ServiceBase.cpp                       |   13 +-
 src/services/ServiceBase.h                         |   28 +-
 src/services/ServiceCapabilities.cpp               |   42 +-
 src/services/ServiceCapabilities.h                 |   34 +-
 src/services/ServiceCollection.cpp                 |    6 -
 src/services/ServiceCollection.h                   |    7 +-
 src/services/ServiceCollectionTreeView.cpp         |   17 +-
 src/services/ServiceMetaBase.cpp                   |   82 +-
 src/services/ServiceMetaBase.h                     |   99 +-
 src/services/ServicePluginManager.cpp              |  244 +-
 src/services/ServicePluginManager.h                |   48 +-
 src/services/ServiceSqlQueryMaker.cpp              |  183 +-
 src/services/ServiceSqlQueryMaker.h                |    9 +-
 src/services/amazon/Amazon.h                       |   77 +
 src/services/amazon/AmazonCart.cpp                 |  123 +
 src/services/amazon/AmazonCart.h                   |   78 +
 src/services/amazon/AmazonCartItem.cpp             |   42 +
 src/services/amazon/AmazonCartItem.h               |   48 +
 src/services/amazon/AmazonCollection.cpp           |   50 +
 src/services/amazon/AmazonCollection.h             |   61 +
 src/services/amazon/AmazonConfig.cpp               |   95 +
 src/services/amazon/AmazonConfig.h                 |   69 +
 src/services/amazon/AmazonConfigWidget.ui          |  134 +
 src/services/amazon/AmazonItemTreeModel.cpp        |  313 +
 src/services/amazon/AmazonItemTreeModel.h          |   71 +
 src/services/amazon/AmazonItemTreeView.cpp         |  303 +
 src/services/amazon/AmazonItemTreeView.h           |   77 +
 src/services/amazon/AmazonMeta.cpp                 |  186 +
 src/services/amazon/AmazonMeta.h                   |  146 +
 src/services/amazon/AmazonParser.cpp               |  217 +
 src/services/amazon/AmazonParser.h                 |   72 +
 src/services/amazon/AmazonSettingsModule.cpp       |  125 +
 src/services/amazon/AmazonSettingsModule.h         |   65 +
 src/services/amazon/AmazonShoppingCartDialog.cpp   |   70 +
 src/services/amazon/AmazonShoppingCartDialog.h     |   46 +
 src/services/amazon/AmazonShoppingCartDialog.ui    |  105 +
 src/services/amazon/AmazonShoppingCartModel.cpp    |   36 +
 src/services/amazon/AmazonShoppingCartModel.h      |   36 +
 src/services/amazon/AmazonShoppingCartView.cpp     |   84 +
 src/services/amazon/AmazonShoppingCartView.h       |   46 +
 src/services/amazon/AmazonStore.cpp                |  588 +
 src/services/amazon/AmazonStore.h                  |  199 +
 src/services/amazon/AmazonUrlRunner.cpp            |   68 +
 src/services/amazon/AmazonUrlRunner.h              |   48 +
 src/services/amazon/CMakeLists.txt                 |   70 +
 .../amazon/amarok_service_amazonstore.desktop      |   59 +
 .../amarok_service_amazonstore_config.desktop      |   27 +
 src/services/amazon/images/CMakeLists.txt          |    5 +
 src/services/amazon/images/hover_info_amazon.png   |  Bin 0 -> 11038 bytes
 src/services/amazon/images/hover_info_amazon.svg   |  101 +
 src/services/ampache/AddServerDialog.cpp           |  108 +
 src/services/ampache/AddServerDialog.h             |   51 +
 src/services/ampache/AmpacheAccountLogin.cpp       |  267 +
 src/services/ampache/AmpacheAccountLogin.h         |   67 +
 src/services/ampache/AmpacheConfigWidget.ui        |  164 +-
 src/services/ampache/AmpacheMeta.cpp               |    9 +
 src/services/ampache/AmpacheMeta.h                 |    1 +
 src/services/ampache/AmpacheService.cpp            |  280 +-
 src/services/ampache/AmpacheService.h              |   25 +-
 src/services/ampache/AmpacheServiceCollection.cpp  |    1 +
 src/services/ampache/AmpacheServiceQueryMaker.cpp  |   79 +-
 src/services/ampache/AmpacheServiceQueryMaker.h    |    9 -
 src/services/ampache/AmpacheSettings.cpp           |  151 +-
 src/services/ampache/AmpacheSettings.h             |    8 +-
 src/services/ampache/CMakeLists.txt                |   29 +-
 src/services/ampache/LastfmInfoParser.cpp          |    4 +-
 src/services/ampache/NewServerWidget.ui            |  107 +
 .../ampache/amarok_service_ampache.desktop         |    9 +-
 .../ampache/amarok_service_ampache_config.desktop  |   14 +-
 src/services/gpodder/CMakeLists.txt                |   80 +
 src/services/gpodder/GpodderConfigWidget.ui        |  122 +
 src/services/gpodder/GpodderMeta.cpp               |   46 +
 src/services/gpodder/GpodderMeta.h                 |   63 +
 src/services/gpodder/GpodderPodcastMeta.cpp        |   64 +
 src/services/gpodder/GpodderPodcastMeta.h          |   61 +
 .../gpodder/GpodderPodcastRequestHandler.cpp       |   45 +
 .../gpodder/GpodderPodcastRequestHandler.h         |   45 +
 src/services/gpodder/GpodderPodcastTreeItem.cpp    |   37 +
 src/services/gpodder/GpodderPodcastTreeItem.h      |   38 +
 src/services/gpodder/GpodderProvider.cpp           | 1079 +
 src/services/gpodder/GpodderProvider.h             |  170 +
 src/services/gpodder/GpodderService.cpp            |  252 +
 src/services/gpodder/GpodderService.h              |   86 +
 src/services/gpodder/GpodderServiceConfig.cpp      |  191 +
 src/services/gpodder/GpodderServiceConfig.h        |   70 +
 src/services/gpodder/GpodderServiceModel.cpp       |  365 +
 src/services/gpodder/GpodderServiceModel.h         |   79 +
 src/services/gpodder/GpodderServiceSettings.cpp    |  236 +
 src/services/gpodder/GpodderServiceSettings.h      |   70 +
 src/services/gpodder/GpodderServiceView.cpp        |   24 +
 src/services/gpodder/GpodderServiceView.h          |   31 +
 .../gpodder/GpodderSortFilterProxyModel.cpp        |   40 +
 src/services/gpodder/GpodderSortFilterProxyModel.h |   34 +
 src/services/gpodder/GpodderTagTreeItem.cpp        |   41 +
 src/services/gpodder/GpodderTagTreeItem.h          |   40 +
 src/services/gpodder/GpodderTreeItem.cpp           |  103 +
 src/services/gpodder/GpodderTreeItem.h             |   60 +
 .../gpodder/amarok_service_gpodder.desktop         |   90 +
 .../gpodder/amarok_service_gpodder_config.desktop  |   44 +
 src/services/gpodder/images/CMakeLists.txt         |    5 +
 src/services/gpodder/images/mygpo.png              |  Bin 0 -> 7460 bytes
 src/services/jamendo/CMakeLists.txt                |    1 -
 src/services/jamendo/JamendoDatabaseHandler.cpp    |    9 +-
 src/services/jamendo/JamendoService.cpp            |   23 +-
 src/services/jamendo/JamendoService.h              |    3 +-
 src/services/jamendo/JamendoXmlParser.cpp          |    2 +-
 .../jamendo/amarok_service_jamendo.desktop         |   15 +-
 src/services/lastfm/AvatarDownloader.cpp           |    2 +
 src/services/lastfm/CMakeLists.txt                 |    4 +
 src/services/lastfm/LastFmConfigWidget.ui          |   14 +-
 src/services/lastfm/LastFmService.cpp              |   85 +-
 src/services/lastfm/LastFmService.h                |   15 +-
 src/services/lastfm/LastFmServiceCollection.cpp    |    2 +-
 src/services/lastfm/LastFmServiceConfig.cpp        |   22 +-
 src/services/lastfm/LastFmServiceConfig.h          |   11 +
 src/services/lastfm/LastFmServiceQueryMaker.cpp    |   23 +-
 src/services/lastfm/LastFmServiceQueryMaker.h      |    6 -
 src/services/lastfm/LastFmServiceSettings.cpp      |   53 +-
 src/services/lastfm/LastFmServiceSettings.h        |    3 +-
 src/services/lastfm/LastFmTreeModel.cpp            |  143 +-
 src/services/lastfm/LastFmTreeModel.h              |   18 +-
 src/services/lastfm/LastFmTreeView.cpp             |    3 +-
 src/services/lastfm/LastFmTreeView.h               |    4 +-
 src/services/lastfm/ScrobblerAdapter.cpp           |   94 +-
 src/services/lastfm/ScrobblerAdapter.h             |   17 +-
 src/services/lastfm/SimilarArtistsAction.cpp       |    2 +-
 src/services/lastfm/amarok_service_lastfm.desktop  |   16 +-
 .../lastfm/amarok_service_lastfm_config.desktop    |   10 +-
 src/services/lastfm/biases/LastFmBias.cpp          |  839 +-
 src/services/lastfm/biases/LastFmBias.h            |  192 +-
 src/services/lastfm/biases/WeeklyTopBias.cpp       |  683 +-
 src/services/lastfm/biases/WeeklyTopBias.h         |  181 +-
 .../meta/CurrentTrackActionsCapabilityImpl_p.h     |   46 -
 src/services/lastfm/meta/LastFmMeta.cpp            |   81 +-
 src/services/lastfm/meta/LastFmMeta.h              |   13 +-
 src/services/lastfm/meta/LastFmMeta_p.h            |   58 +-
 .../lastfm/meta/MultiPlayableCapabilityImpl_p.h    |   16 +-
 src/services/magnatune/CMakeLists.txt              |    2 -
 .../magnatune/MagnatuneAlbumDownloader.cpp         |    2 +-
 .../magnatune/MagnatuneDatabaseHandler.cpp         |    2 +
 .../magnatune/MagnatuneDownloadHandler.cpp         |   10 +-
 src/services/magnatune/MagnatuneDownloadInfo.cpp   |    3 +-
 src/services/magnatune/MagnatuneInfoParser.cpp     |    4 +-
 src/services/magnatune/MagnatuneSettingsModule.cpp |    4 +-
 .../magnatune/MagnatuneSignupDialogBase.ui         |    4 +-
 src/services/magnatune/MagnatuneStore.cpp          |   24 +-
 src/services/magnatune/MagnatuneStore.h            |    3 +-
 src/services/magnatune/MagnatuneUrlRunner.cpp      |    2 +
 .../amarok_service_magnatunestore.desktop          |   16 +-
 .../amarok_service_magnatunestore_config.desktop   |   16 +-
 src/services/mp3tunes/CMakeLists.txt               |    2 -
 src/services/mp3tunes/Mp3tunesHarmonyHandler.cpp   |    3 +
 src/services/mp3tunes/Mp3tunesLocker.cpp           |    3 +
 src/services/mp3tunes/Mp3tunesService.cpp          |   68 +-
 src/services/mp3tunes/Mp3tunesService.h            |    6 +-
 .../mp3tunes/Mp3tunesServiceCollection.cpp         |    2 +-
 .../mp3tunes/Mp3tunesServiceCollectionLocation.cpp |   10 +-
 .../mp3tunes/Mp3tunesServiceCollectionLocation.h   |    6 +-
 .../mp3tunes/Mp3tunesServiceQueryMaker.cpp         |   57 +-
 src/services/mp3tunes/Mp3tunesServiceQueryMaker.h  |    3 -
 src/services/mp3tunes/Mp3tunesWorkers.cpp          |   16 +-
 src/services/mp3tunes/Mp3tunesWorkers.h            |    1 +
 .../mp3tunes/amarok_service_mp3tunes.desktop       |   22 +-
 .../amarok_service_mp3tunes_config.desktop         |   14 +-
 src/services/mp3tunes/libmp3tunes/locker.c         |    2 +-
 src/services/opmldirectory/AddOpmlWidget.ui        |  113 +
 src/services/opmldirectory/CMakeLists.txt          |    8 +-
 .../opmldirectory/OpmlDirectoryDelegate.cpp        |   22 +
 src/services/opmldirectory/OpmlDirectoryDelegate.h |   34 +
 .../opmldirectory/OpmlDirectoryInfoParser.cpp      |    3 +-
 src/services/opmldirectory/OpmlDirectoryModel.cpp  |  514 +
 src/services/opmldirectory/OpmlDirectoryModel.h    |   97 +
 .../opmldirectory/OpmlDirectoryService.cpp         |  306 +-
 src/services/opmldirectory/OpmlDirectoryService.h  |   62 +-
 src/services/opmldirectory/OpmlDirectoryView.cpp   |   71 +
 src/services/opmldirectory/OpmlDirectoryView.h     |   25 +
 .../amarok_service_opmldirectory.desktop           |   19 +-
 src/services/opmldirectory/podcast_directory.opml  |    8 +
 .../scriptable/ScriptableServiceInfoParser.cpp     |    2 +-
 .../scriptable/ScriptableServiceManager.cpp        |    4 +-
 src/services/scriptable/ScriptableServiceMeta_p.h  |    5 -
 .../scriptable/ScriptableServiceQueryMaker.cpp     |   60 +-
 .../scriptable/ScriptableServiceQueryMaker.h       |    4 -
 src/statemanagement/ApplicationController.h        |    2 +-
 .../DefaultApplicationController.cpp               |    7 +-
 src/statemanagement/DefaultApplicationController.h |    2 +-
 src/statusbar/CompoundProgressBar.cpp              |  124 +-
 src/statusbar/CompoundProgressBar.h                |   24 +-
 src/statusbar/LongMessageWidget.cpp                |   45 +-
 src/statusbar/LongMessageWidget.h                  |   31 +-
 src/statusbar/PopupWidget.cpp                      |    8 +-
 src/statusbar/PopupWidget.h                        |    3 +-
 src/statusbar/ProgressBar.cpp                      |   71 +-
 src/statusbar/ProgressBar.h                        |   18 +-
 src/statusbar/StatusBar.cpp                        |  450 -
 src/statusbar/StatusBar.h                          |  178 -
 src/synchronization/SynchronizationBaseJob.cpp     |  136 +-
 src/synchronization/SynchronizationBaseJob.h       |   27 +-
 src/themes/context/Amarok-Mockup/colors            |    2 +-
 src/themes/context/Amarok-Mockup/metadata.desktop  |    6 +-
 src/toolbar/CurrentTrackToolbar.cpp                |   39 +-
 src/toolbar/CurrentTrackToolbar.h                  |   15 +-
 src/toolbar/MainToolbar.cpp                        |  420 +-
 src/toolbar/MainToolbar.h                          |   42 +-
 src/toolbar/SlimToolbar.cpp                        |    1 -
 src/toolbar/SlimToolbar.h                          |    2 +-
 src/toolbar/VolumePopupButton.cpp                  |   17 +-
 src/toolbar/VolumePopupButton.h                    |   13 +-
 src/transcoding/CMakeLists.txt                     |   44 +
 src/transcoding/TranscodingAssistantDialog.cpp     |  181 +
 src/transcoding/TranscodingAssistantDialog.h       |   62 +
 src/transcoding/TranscodingAssistantDialog.ui      |  378 +
 src/transcoding/TranscodingJob.cpp                 |  180 +
 src/transcoding/TranscodingJob.h                   |   99 +
 .../TranscodingOptionsStackedWidget.cpp            |  109 +
 src/transcoding/TranscodingOptionsStackedWidget.h  |   60 +
 .../TranscodingPropertyComboBoxWidget.cpp          |   62 +
 .../TranscodingPropertyComboBoxWidget.h            |   51 +
 .../TranscodingPropertySliderWidget.cpp            |  111 +
 src/transcoding/TranscodingPropertySliderWidget.h  |   54 +
 .../TranscodingPropertySpinBoxWidget.cpp           |   60 +
 src/transcoding/TranscodingPropertySpinBoxWidget.h |   50 +
 src/transcoding/TranscodingPropertyWidget.cpp      |   45 +
 src/transcoding/TranscodingPropertyWidget.h        |   51 +
 src/transcoding/amarok_transcoding_export.h        |   35 +
 src/widgets/AmarokDockWidget.cpp                   |   30 +-
 src/widgets/AmarokDockWidget.h                     |   11 -
 src/widgets/BookmarkPopup.cpp                      |    1 -
 src/widgets/BreadcrumbItemButton.cpp               |    2 +-
 src/widgets/ClearSpinBox.cpp                       |   42 +
 src/widgets/ClearSpinBox.h                         |   35 +
 src/widgets/ExpandingControlsWidget.cpp            |   98 -
 src/widgets/ExpandingControlsWidget.h              |   54 -
 src/widgets/HintLineEdit.cpp                       |   77 +
 src/widgets/HintLineEdit.h                         |   46 +
 src/widgets/LineEdit.cpp                           |    6 +
 src/widgets/LineEdit.h                             |    2 +
 src/widgets/MainControlsButton.cpp                 |  138 -
 src/widgets/MainControlsButton.h                   |   56 -
 src/widgets/MainControlsWidget.cpp                 |  114 -
 src/widgets/MainControlsWidget.h                   |   49 -
 src/widgets/MetaQueryWidget.cpp                    | 1052 +
 src/widgets/MetaQueryWidget.h                      |  211 +
 src/widgets/Osd.cpp                                |  210 +-
 src/widgets/Osd.h                                  |   87 +-
 src/widgets/PixmapViewer.cpp                       |   23 +-
 src/widgets/PixmapViewer.h                         |   14 +-
 src/widgets/PrettyTreeView.cpp                     |    1 +
 src/widgets/PrettyTreeView.h                       |   29 +-
 src/widgets/ProgressWidget.cpp                     |  264 +-
 src/widgets/ProgressWidget.h                       |   28 +-
 src/widgets/SearchWidget.cpp                       |  203 +-
 src/widgets/SearchWidget.h                         |   71 +-
 src/widgets/SliderWidget.cpp                       |   10 +-
 src/widgets/Splitter.cpp                           |   67 -
 src/widgets/Splitter.h                             |   64 -
 src/{ => widgets}/StarManager.cpp                  |    0
 src/{ => widgets}/StarManager.h                    |    0
 src/widgets/TimeLabel.cpp                          |   66 +
 src/widgets/TimeLabel.h                            |   55 +-
 src/widgets/Token.cpp                              |    6 +-
 src/widgets/Token.h                                |    8 +-
 src/widgets/TokenDropTarget.cpp                    |    9 +-
 src/widgets/TokenPool.cpp                          |    3 +-
 src/widgets/TokenWithLayout.cpp                    |   20 +-
 src/widgets/TokenWithLayout.h                      |    8 +-
 src/widgets/TrackSelectWidget.cpp                  |    6 +-
 src/widgets/VolumeWidget.cpp                       |   97 -
 src/widgets/VolumeWidget.h                         |   57 -
 src/widgets/hintlineedit.cpp                       |   77 -
 src/widgets/hintlineedit.h                         |   43 -
 src/widgets/kratingpainter.cpp                     |    4 +-
 src/widgets/kratingwidget.cpp                      |    5 +-
 src/widgets/kratingwidget.h                        |    8 +-
 tests/CMakeLists.txt                               |   20 +-
 tests/TestAmarok.cpp                               |   79 -
 tests/TestAmarok.h                                 |    4 -
 tests/TestCaseConverter.cpp                        |    4 -
 tests/TestDebug.cpp                                |   93 +
 tests/TestExpression.cpp                           |    2 +-
 tests/TestQStringx.cpp                             |   53 +-
 tests/TestTagGuesser.cpp                           |   26 +-
 tests/TestTrackOrganizer.cpp                       |    6 +-
 .../browsers/TestSingleCollectionTreeItemModel.cpp |   37 +-
 tests/browsers/TestSingleCollectionTreeItemModel.h |    2 +-
 .../context/engines/upcomingevents/CMakeLists.txt  |    1 +
 .../upcomingevents/TestUpcomingEventsEngine.cpp    |    2 +-
 tests/core-impl/collections/CMakeLists.txt         |    2 +-
 tests/core-impl/collections/db/sql/CMakeLists.txt  |  136 +
 .../core-impl/collections/db/sql/ScanManagerMock.h |   37 +
 .../collections/db/sql/SqlMountPointManagerMock.h  |  104 +
 .../collections/db/sql/TestDatabaseUpdater.cpp     |  156 +
 .../collections/db/sql/TestDatabaseUpdater.h       |   54 +
 .../core-impl/collections/db/sql/TestSqlAlbum.cpp  |  419 +
 tests/core-impl/collections/db/sql/TestSqlAlbum.h  |   67 +
 .../core-impl/collections/db/sql/TestSqlArtist.cpp |   98 +
 tests/core-impl/collections/db/sql/TestSqlArtist.h |   52 +
 .../collections/db/sql/TestSqlCollection.cpp       |   93 +
 .../{sqlcollection => db/sql}/TestSqlCollection.h  |    0
 .../db/sql/TestSqlCollectionLocation.cpp           |  277 +
 .../collections/db/sql/TestSqlCollectionLocation.h |   57 +
 .../collections/db/sql/TestSqlQueryMaker.cpp       | 1025 +
 .../collections/db/sql/TestSqlQueryMaker.h         |  102 +
 .../collections/db/sql/TestSqlScanManager.cpp      | 1492 ++
 .../collections/db/sql/TestSqlScanManager.h        |  164 +
 .../core-impl/collections/db/sql/TestSqlTrack.cpp  |  557 +
 tests/core-impl/collections/db/sql/TestSqlTrack.h  |   72 +
 .../proxycollection/TestProxyCollectionMeta.cpp    |    4 +-
 .../collections/sqlcollection/CMakeLists.txt       |  263 -
 .../sqlcollection/DatabaseUpdaterTest.cpp          |   82 -
 .../sqlcollection/DatabaseUpdaterTest.h            |   36 -
 .../collections/sqlcollection/IScanManagerMock.h   |   37 -
 .../sqlcollection/SqlMountPointManagerMock.h       |   97 -
 .../sqlcollection/TestAlbumCompilationChange.cpp   |  312 -
 .../sqlcollection/TestAlbumCompilationChange.h     |   67 -
 .../collections/sqlcollection/TestArtistHelper.cpp |   56 -
 .../sqlcollection/TestScanResultProcessorFull.cpp  |  679 -
 .../sqlcollection/TestScanResultProcessorFull.h    |   66 -
 .../collections/sqlcollection/TestSqlArtist.cpp    |   69 -
 .../collections/sqlcollection/TestSqlArtist.h      |   33 -
 .../sqlcollection/TestSqlCollection.cpp            |  100 -
 .../sqlcollection/TestSqlCollectionLocation.cpp    |  289 -
 .../sqlcollection/TestSqlCollectionLocation.h      |   58 -
 .../sqlcollection/TestSqlQueryMaker.cpp            | 1189 -
 .../collections/sqlcollection/TestSqlQueryMaker.h  |  103 -
 .../collections/sqlcollection/TestSqlTrack.cpp     |  237 -
 .../collections/sqlcollection/TestSqlTrack.h       |   60 -
 .../sqlcollection/TestSqlTrackEditing.cpp          |  401 -
 .../sqlcollection/TestSqlTrackEditing.h            |   59 -
 tests/core-impl/collections/support/CMakeLists.txt |   20 +
 .../collections/support/TestArtistHelper.cpp       |   56 +
 .../{sqlcollection => support}/TestArtistHelper.h  |    0
 .../collections/support/TestMemoryQueryMaker.cpp   |  223 +-
 .../collections/support/TestMemoryQueryMaker.h     |   29 +-
 tests/core-impl/meta/cue/TestCueFileSupport.cpp    |    6 +-
 tests/core-impl/meta/file/TestMetaFileTrack.cpp    |   71 +-
 tests/core-impl/meta/file/TestMetaFileTrack.h      |    1 -
 tests/core-impl/meta/multi/CMakeLists.txt          |    1 -
 tests/core-impl/meta/multi/TestMetaMultiTrack.cpp  |    8 +-
 .../core-impl/playlists/types/file/CMakeLists.txt  |    1 +
 .../playlists/types/file/xspf/TestXSPFPlaylist.cpp |    4 +-
 .../collections/MockCollectionLocationDelegate.h   |    1 +
 tests/core/meta/TestMetaTrack.cpp                  |   16 +-
 tests/core/meta/TestMetaTrack.h                    |    1 -
 tests/dynamic/CMakeLists.txt                       |   63 +
 tests/dynamic/TestDynamicModel.cpp                 |  435 +
 tests/dynamic/TestDynamicModel.h                   |   45 +
 tests/dynamic/TestTrackSet.cpp                     |  197 +
 tests/dynamic/TestTrackSet.h                       |   48 +
 tests/mocks/AftUtilityMock.cpp                     |   45 -
 tests/mocks/MetaMock.h                             |    5 +-
 tests/mocks/MockLogger.h                           |    9 +-
 tests/mocks/MockTrack.h                            |    7 +-
 tests/mocks/SqlStorageMock.h                       |    4 +-
 tests/mpristest.py                                 |   65 +
 tests/playlist/CMakeLists.txt                      |    2 +-
 tests/playlist/TestPlaylistModels.cpp              |   70 +-
 tests/playlistmanager/file/CMakeLists.txt          |    1 +
 tests/playlistmanager/sql/CMakeLists.txt           |    1 +
 tests/synchronization/CMakeLists.txt               |    3 +
 .../TestMasterSlaveSynchronizationJob.cpp          |    4 +-
 .../TestOneWaySynchronizationJob.cpp               |    8 +-
 tests/synchronization/TestUnionJob.cpp             |    4 +-
 tests/timecode/CMakeLists.txt                      |    1 +
 utilities/CMakeLists.txt                           |    5 +-
 utilities/afttagger/AFTTagger.cpp                  |  270 +-
 utilities/afttagger/AFTTagger.h                    |    4 +
 utilities/afttagger/CMakeLists.txt                 |   13 +-
 utilities/collectionscanner/AFTUtility.cpp         |  242 -
 utilities/collectionscanner/AFTUtility.h           |   39 -
 utilities/collectionscanner/Album.cpp              |  135 +
 utilities/collectionscanner/Album.h                |   82 +
 utilities/collectionscanner/BatchFile.cpp          |  152 +
 utilities/collectionscanner/BatchFile.h            |   75 +
 utilities/collectionscanner/CMakeLists.txt         |   89 +-
 utilities/collectionscanner/CollectionScanner.cpp  | 1196 +-
 utilities/collectionscanner/CollectionScanner.h    |  164 +-
 utilities/collectionscanner/Directory.cpp          |  250 +
 utilities/collectionscanner/Directory.h            |  109 +
 utilities/collectionscanner/Playlist.cpp           |   72 +
 utilities/collectionscanner/Playlist.h             |   71 +
 utilities/collectionscanner/Track.cpp              |  550 +
 utilities/collectionscanner/Track.h                |  167 +
 utilities/updatesigner/CMakeLists.txt              |   37 +-
 2564 files changed, 1218586 insertions(+), 470497 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list