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

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


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

The following commit has been merged in the experimental branch:
commit 3665e9cb00b93c2b2032d736f7e1b0d974b0c41e
Merge: d5244e3449d8153eb50680b84b8773c4a5a2d6eb b7c920fa1dba053c1d389ffad4918153d9e4739f
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 3 00:00:05 2012 +0300

    Merge tag 'upstream/2.6_beta1' into experimental
    
    Upstream version 2.6~beta1

 CMakeLists.txt                                     |   20 +-
 ChangeLog                                          |  169 +-
 README                                             |   21 +-
 cmake/modules/FindGooglemock.cmake                 |   43 +-
 cmake/modules/FindMySQLAmarok.cmake                |   28 +-
 doc/CMakeLists.txt                                 |   12 +-
 doc/en_US/Amarok2-4-1MergeIcon.png                 |  Bin 719 -> 0 bytes
 doc/en_US/Amarok2WrenchIcon.png                    |  Bin 1312 -> 0 bytes
 doc/en_US/Face-smile.png                           |  Bin 1307 -> 1428 bytes
 doc/en_US/Icon-action-dynamic-amarok.png           |  Bin 0 -> 921 bytes
 doc/en_US/Icon-application-exit.png                |  Bin 842 -> 1140 bytes
 doc/en_US/Icon-bookmark-new-list.png               |  Bin 1100 -> 1100 bytes
 doc/en_US/Icon-configure.png                       |  Bin 717 -> 890 bytes
 doc/en_US/Icon-dialog-information.png              |  Bin 993 -> 993 bytes
 doc/en_US/Icon-document-export.png                 |  Bin 0 -> 731 bytes
 doc/en_US/Icon-document-import.png                 |  Bin 0 -> 724 bytes
 doc/en_US/Icon-document-new.png                    |  Bin 0 -> 755 bytes
 doc/en_US/Icon-document-properties.png             |  Bin 0 -> 936 bytes
 doc/en_US/Icon-document-save.png                   |  Bin 798 -> 798 bytes
 doc/en_US/Icon-edit-clear-list.png                 |  Bin 0 -> 1327 bytes
 doc/en_US/Icon-edit-clear-locationbar-rtl.png      |  Bin 742 -> 742 bytes
 doc/en_US/Icon-edit-copy.png                       |  Bin 0 -> 736 bytes
 doc/en_US/Icon-edit-delete.png                     |  Bin 0 -> 739 bytes
 doc/en_US/Icon-emblem-favorite.png                 |  Bin 1993 -> 1993 bytes
 doc/en_US/Icon-emblem-mounted.png                  |  Bin 0 -> 554 bytes
 doc/en_US/Icon-flag-green.png                      |  Bin 1857 -> 1857 bytes
 doc/en_US/Icon-folder-new.png                      |  Bin 729 -> 729 bytes
 doc/en_US/Icon-folder-remote.png                   |  Bin 824 -> 824 bytes
 doc/en_US/Icon-go-down.png                         |  Bin 788 -> 788 bytes
 doc/en_US/Icon-go-home.png                         |  Bin 731 -> 731 bytes
 doc/en_US/Icon-go-next.png                         |  Bin 797 -> 797 bytes
 doc/en_US/Icon-go-previous.png                     |  Bin 746 -> 746 bytes
 doc/en_US/Icon-go-up.png                           |  Bin 817 -> 817 bytes
 doc/en_US/Icon-list-add.png                        |  Bin 564 -> 722 bytes
 doc/en_US/Icon-list-remove.png                     |  Bin 0 -> 492 bytes
 doc/en_US/Icon-media-playback-pause.png            |  Bin 607 -> 607 bytes
 doc/en_US/Icon-media-playback-start.png            |  Bin 619 -> 619 bytes
 doc/en_US/Icon-media-playback-stop.png             |  Bin 619 -> 619 bytes
 doc/en_US/Icon-preferences-other.png               |  Bin 0 -> 1084 bytes
 doc/en_US/Icon-view-list-tree.png                  |  Bin 0 -> 439 bytes
 doc/en_US/Icon-view-refresh.png                    |  Bin 1250 -> 1250 bytes
 doc/en_US/action-collection-amarok48.png           |  Bin 0 -> 3835 bytes
 doc/en_US/advancedtok.png                          |  Bin 3697 -> 3697 bytes
 doc/en_US/album.png                                |  Bin 0 -> 11731 bytes
 doc/en_US/albumbar.png                             |  Bin 0 -> 5744 bytes
 doc/en_US/amarok-apg-presets-toolbar.png           |  Bin 0 -> 3948 bytes
 doc/en_US/amarok-context.png                       |  Bin 85950 -> 85950 bytes
 doc/en_US/amarok-contextadd.png                    |  Bin 111383 -> 0 bytes
 doc/en_US/amarok-e17.png                           |  Bin 134027 -> 134027 bytes
 doc/en_US/amarok-fluxbox.png                       |  Bin 164449 -> 164449 bytes
 doc/en_US/amarok-gnome.png                         |  Bin 245162 -> 245162 bytes
 doc/en_US/amarok-lxde.png                          |  Bin 221820 -> 221820 bytes
 doc/en_US/amarok-mac-port-install.png              |  Bin 37815 -> 37815 bytes
 doc/en_US/amarok-maintoolbar.png                   |  Bin 14672 -> 14672 bytes
 doc/en_US/amarok-managing-media.png                |  Bin 71658 -> 61437 bytes
 doc/en_US/amarok-merge-icon.png                    |  Bin 545 -> 0 bytes
 doc/en_US/amarok-newdynamic-detail.png             |  Bin 40986 -> 40986 bytes
 doc/en_US/amarok-newdynamic.png                    |  Bin 223587 -> 223587 bytes
 doc/en_US/amarok-renameplaylist.png                |  Bin 37231 -> 37231 bytes
 doc/en_US/amarok-slimtoolbar.png                   |  Bin 5455 -> 5455 bytes
 doc/en_US/amarok-xfce.png                          |  Bin 156984 -> 156984 bytes
 doc/en_US/amarok2-4-1albumtageditdialog.png        |  Bin 42843 -> 42843 bytes
 .../amarok2-4-1albumtageditpertrackdialog.png      |  Bin 45188 -> 45188 bytes
 doc/en_US/amarok2-4-1configplayback.png            |  Bin 51718 -> 51718 bytes
 doc/en_US/amarok2-4-1configscripts.png             |  Bin 115415 -> 115415 bytes
 doc/en_US/amarok2-4-1configspeakersetup.png        |  Bin 99149 -> 99149 bytes
 doc/en_US/amarok2-4-1configuredialog.png           |  Bin 59989 -> 59989 bytes
 doc/en_US/amarok2-4-1configuredialogcollection.png |  Bin 65681 -> 83312 bytes
 doc/en_US/amarok2-4-1configuredialogplugins.png    |  Bin 123901 -> 123901 bytes
 doc/en_US/amarok2-4-1databaseconfig.png            |  Bin 64075 -> 64075 bytes
 doc/en_US/amarok2-4-1editfilterdialog.png          |  Bin 37670 -> 37670 bytes
 .../amarok2-4-1filenamelayoutchooseroptions.png    |  Bin 12589 -> 12589 bytes
 doc/en_US/amarok2-4-1mergedviewcollection.png      |  Bin 26699 -> 26699 bytes
 doc/en_US/amarok2-4-1non-mergedviewcollection.png  |  Bin 25374 -> 25374 bytes
 doc/en_US/amarok2-4-1notifications.png             |  Bin 53843 -> 53843 bytes
 doc/en_US/amarok2-4-1phononbackends.png            |  Bin 54489 -> 54489 bytes
 doc/en_US/amarok2-4-1phonondevices.png             |  Bin 63269 -> 63269 bytes
 doc/en_US/amarok2-4-1saveplaylistchoices.png       |  Bin 11120 -> 11120 bytes
 doc/en_US/amarok2-4-1tageditdialog.png             |  Bin 44461 -> 44461 bytes
 doc/en_US/amarok2-4-1viewmenu.png                  |  Bin 7454 -> 7454 bytes
 doc/en_US/amarok2-4-playlistsearchfilter.png       |  Bin 8556 -> 0 bytes
 doc/en_US/amarok2-4.png                            |  Bin 251280 -> 170645 bytes
 doc/en_US/amarok2-4collectionsortingmenu.png       |  Bin 53494 -> 78259 bytes
 doc/en_US/amarok2-4helpmenu.png                    |  Bin 20450 -> 20450 bytes
 doc/en_US/amarok2-4musicbrainztagger.png           |  Bin 44726 -> 44726 bytes
 doc/en_US/amarok2-4organizefilesadvanceddialog.png |  Bin 15711 -> 15711 bytes
 doc/en_US/amarok2-4organizefilesbasicdialog.png    |  Bin 107770 -> 107770 bytes
 doc/en_US/amarok2-4queueeditor.png                 |  Bin 26516 -> 26516 bytes
 doc/en_US/amarok2-4searchplaylist.png              |  Bin 6074 -> 6074 bytes
 doc/en_US/amarok2-4transcodetracksdialog.png       |  Bin 44466 -> 44466 bytes
 doc/en_US/amarok24_configureshortcutdetail.png     |  Bin 10127 -> 10127 bytes
 doc/en_US/amarok24_configureshortcutsdialog.png    |  Bin 68653 -> 68653 bytes
 doc/en_US/amarok24_settingsmenu.png                |  Bin 9141 -> 9141 bytes
 doc/en_US/amarok24_settingsmenu_withreplaygain.png |  Bin 13576 -> 13576 bytes
 doc/en_US/amarok24_toolsmenu_withtwoscripts.png    |  Bin 13484 -> 0 bytes
 doc/en_US/amarok2_moodbar.png                      |  Bin 54702 -> 54702 bytes
 doc/en_US/amarok_add-on_installer.png              |  Bin 63513 -> 63513 bytes
 doc/en_US/amarok_addtoplaylist.png                 |  Bin 309573 -> 309573 bytes
 doc/en_US/amarok_addtoplaylist1.png                |  Bin 48826 -> 48826 bytes
 doc/en_US/amarok_amarokmenu2-4.png                 |  Bin 19505 -> 19505 bytes
 doc/en_US/amarok_ampache_client2.png               |  Bin 0 -> 24108 bytes
 doc/en_US/amarok_connecting_media_devices.png      |  Bin 18290 -> 18290 bytes
 doc/en_US/amarok_cover_manager.png                 |  Bin 218474 -> 218474 bytes
 doc/en_US/amarok_cover_manager_newcover.png        |  Bin 301112 -> 301112 bytes
 doc/en_US/amarok_dynamic_playlist.png              |  Bin 183876 -> 183876 bytes
 doc/en_US/amarok_layout11.png                      |  Bin 116734 -> 116734 bytes
 doc/en_US/amarok_layout22.png                      |  Bin 148766 -> 148766 bytes
 doc/en_US/amarok_layout23.png                      |  Bin 177692 -> 177692 bytes
 doc/en_US/amarok_layout24.png                      |  Bin 218221 -> 218221 bytes
 doc/en_US/amarok_layout25.png                      |  Bin 174064 -> 174064 bytes
 doc/en_US/amarok_layout26.png                      |  Bin 87228 -> 87228 bytes
 doc/en_US/amarok_layout27.png                      |  Bin 110819 -> 110819 bytes
 doc/en_US/amarok_layout28.png                      |  Bin 62911 -> 62911 bytes
 doc/en_US/amarok_loading_media_devices.png         |  Bin 21523 -> 21523 bytes
 doc/en_US/amarok_locale_selection.png              |  Bin 0 -> 37983 bytes
 doc/en_US/amarok_main_toolbar.png                  |  Bin 13291 -> 13291 bytes
 doc/en_US/amarok_media_devices.png                 |  Bin 34411 -> 34411 bytes
 doc/en_US/amarok_on_mac.png                        |  Bin 164620 -> 164620 bytes
 doc/en_US/amarok_playlist.png                      |  Bin 80479 -> 0 bytes
 doc/en_US/amarok_playlist_bookmarking.png          |  Bin 9963 -> 0 bytes
 doc/en_US/amarok_playlist_contextmenu.png          |  Bin 12342 -> 0 bytes
 doc/en_US/amarok_playlist_functions.png            |  Bin 6076 -> 0 bytes
 doc/en_US/amarok_playlist_layout_d.png             |  Bin 25104 -> 0 bytes
 doc/en_US/amarok_playlist_layout_d_ss.png          |  Bin 39325 -> 39325 bytes
 doc/en_US/amarok_playlist_layout_editor.png        |  Bin 68225 -> 68225 bytes
 doc/en_US/amarok_playlist_layout_nog1.png          |  Bin 15433 -> 0 bytes
 doc/en_US/amarok_playlist_layout_nog1_s.png        |  Bin 45381 -> 45381 bytes
 doc/en_US/amarok_playlist_layout_nog2.png          |  Bin 15480 -> 0 bytes
 doc/en_US/amarok_playlist_layout_nog2_s.png        |  Bin 30021 -> 30021 bytes
 doc/en_US/amarok_playlist_layout_v.png             |  Bin 15600 -> 0 bytes
 doc/en_US/amarok_playlist_layout_v1_s.png          |  Bin 59077 -> 59077 bytes
 doc/en_US/amarok_playlist_manipulation.png         |  Bin 48014 -> 48014 bytes
 doc/en_US/amarok_playlist_search2.png              |  Bin 82721 -> 0 bytes
 doc/en_US/amarok_playlist_search_ex.png            |  Bin 20412 -> 20412 bytes
 doc/en_US/amarok_playlist_sortingleavel.png        |  Bin 19613 -> 0 bytes
 doc/en_US/amarok_removeformplaylist.png            |  Bin 247020 -> 247020 bytes
 doc/en_US/amarok_saved_playlists.png               |  Bin 47482 -> 47482 bytes
 doc/en_US/amarok_script_info.png                   |  Bin 20125 -> 20125 bytes
 doc/en_US/amarok_script_manager.png                |  Bin 93143 -> 93143 bytes
 doc/en_US/amarok_show_only_matches.png             |  Bin 7706 -> 7706 bytes
 doc/en_US/amarok_slim_toolbar.png                  |  Bin 8737 -> 8737 bytes
 doc/en_US/amarok_tracks_media_devices1.png         |  Bin 53302 -> 53302 bytes
 doc/en_US/amarok_windowlayout.png                  |  Bin 229025 -> 229025 bytes
 doc/en_US/amarokbreadcrumb.png                     |  Bin 11615 -> 11615 bytes
 doc/en_US/amarokmediasources-files.png             |  Bin 17328 -> 17328 bytes
 doc/en_US/amarokmediasources-home.png              |  Bin 27699 -> 27699 bytes
 doc/en_US/amaroknew2-4.png                         |  Bin 100592 -> 133093 bytes
 doc/en_US/amarokrightmenu.png                      |  Bin 16616 -> 17892 bytes
 doc/en_US/amarokripcd.png                          |  Bin 44325 -> 92903 bytes
 doc/en_US/amaroksystray.png                        |  Bin 9546 -> 4147 bytes
 doc/en_US/amaroktoplevelmenus2-4.png               |  Bin 8679 -> 8679 bytes
 doc/en_US/amarokwindow_context.png                 |  Bin 86845 -> 86845 bytes
 doc/en_US/amarokwindow_mediasources.png            |  Bin 61354 -> 61354 bytes
 doc/en_US/amarokwindow_playlist.png                |  Bin 64239 -> 64239 bytes
 doc/en_US/apgpresetsmatchallgroup.png              |  Bin 39180 -> 39180 bytes
 doc/en_US/app.png                                  |  Bin 0 -> 60721 bytes
 doc/en_US/applications-internet.png                |  Bin 5276 -> 5276 bytes
 doc/en_US/bookmarking_menu.png                     |  Bin 0 -> 4051 bytes
 doc/en_US/cd_collection_sansa.png                  |  Bin 69799 -> 69799 bytes
 doc/en_US/configure_amarok.png                     |  Bin 53401 -> 0 bytes
 doc/en_US/context_menu.png                         |  Bin 0 -> 6162 bytes
 doc/en_US/contextpane.png                          |  Bin 225481 -> 225481 bytes
 doc/en_US/contextpanestopped.png                   |  Bin 119676 -> 119676 bytes
 doc/en_US/controlamarok.png                        |  Bin 16747 -> 16747 bytes
 doc/en_US/document-new.png                         |  Bin 2937 -> 0 bytes
 doc/en_US/document-save.png                        |  Bin 2278 -> 2278 bytes
 doc/en_US/dynamic_playlist.png                     |  Bin 26292 -> 26292 bytes
 doc/en_US/edit-copy.png                            |  Bin 1773 -> 0 bytes
 doc/en_US/edit-redo.png                            |  Bin 3587 -> 3587 bytes
 doc/en_US/edit-undo.png                            |  Bin 3621 -> 3621 bytes
 doc/en_US/favor-menu.png                           |  Bin 2091 -> 0 bytes
 doc/en_US/favor.png                                |  Bin 0 -> 3526 bytes
 doc/en_US/firstruncollection2.png                  |  Bin 28064 -> 28064 bytes
 doc/en_US/folder-amarok.png                        |  Bin 1370 -> 1370 bytes
 doc/en_US/generatedlist.png                        |  Bin 231006 -> 231006 bytes
 doc/en_US/generatingtree.png                       |  Bin 125711 -> 125711 bytes
 doc/en_US/hi32-action-collection-amarok.png        |  Bin 2220 -> 0 bytes
 doc/en_US/hi48-action-clear-playlist-amarok.png    |  Bin 3477 -> 3477 bytes
 doc/en_US/hi48-action-edit-playlist-queue.png      |  Bin 1040 -> 1040 bytes
 ...ion-media-standard-track-progression-amarok.png |  Bin 3154 -> 3154 bytes
 doc/en_US/hi48-action-music-amarok.png             |  Bin 3048 -> 3048 bytes
 doc/en_US/hi48-action-podcast-amarok.png           |  Bin 4416 -> 4416 bytes
 doc/en_US/index.docbook                            | 1303 +-
 doc/en_US/installation1-1.png                      |  Bin 14898 -> 14898 bytes
 doc/en_US/installation2.png                        |  Bin 13147 -> 13147 bytes
 doc/en_US/installation3.png                        |  Bin 11368 -> 11368 bytes
 doc/en_US/installation4.png                        |  Bin 11315 -> 11315 bytes
 doc/en_US/lowerpart.png                            |  Bin 19056 -> 0 bytes
 doc/en_US/media_sources1.png                       |  Bin 28168 -> 28168 bytes
 doc/en_US/media_sources3.png                       |  Bin 13344 -> 12756 bytes
 doc/en_US/mediasources.png                         |  Bin 34004 -> 54088 bytes
 doc/en_US/mediasources10.png                       |  Bin 10220 -> 10220 bytes
 doc/en_US/mediasources4.png                        |  Bin 0 -> 47012 bytes
 doc/en_US/mediasources5.png                        |  Bin 24486 -> 24486 bytes
 doc/en_US/mediasources6.png                        |  Bin 34364 -> 34364 bytes
 doc/en_US/mediasources7.png                        |  Bin 21711 -> 21711 bytes
 doc/en_US/mediasources8.png                        |  Bin 10853 -> 10853 bytes
 doc/en_US/mediasourcesex.png                       |  Bin 15069 -> 15069 bytes
 doc/en_US/menuitems.png                            |  Bin 7023 -> 0 bytes
 ...w_amarok_configuration_options_general_edit.png |  Bin 0 -> 73935 bytes
 ...ok_configuration_options_notifications_edit.png |  Bin 0 -> 58591 bytes
 doc/en_US/nocover_amarok.png                       |  Bin 3804 -> 3804 bytes
 doc/en_US/oraganize_menu.png                       |  Bin 22968 -> 22968 bytes
 doc/en_US/otherplatforms_nonkde.png                |  Bin 5941 -> 5941 bytes
 doc/en_US/otherplatforms_osx.png                   |  Bin 7950 -> 7950 bytes
 doc/en_US/otherplatforms_windows.png               |  Bin 7104 -> 7104 bytes
 doc/en_US/playlist-album-menu.png                  |  Bin 5045 -> 0 bytes
 doc/en_US/playlist-layout-editor-amarok.png        |  Bin 77805 -> 77805 bytes
 .../playlist-layout-item-configuration-amarok.png  |  Bin 25276 -> 25276 bytes
 doc/en_US/playlist-ordering.png                    |  Bin 3261 -> 0 bytes
 doc/en_US/playlist.png                             |  Bin 14341 -> 0 bytes
 doc/en_US/playlist2.png                            |  Bin 0 -> 25614 bytes
 doc/en_US/playlist_save.png                        |  Bin 0 -> 11984 bytes
 doc/en_US/playlist_save_icon_amarok.png            |  Bin 1400 -> 0 bytes
 doc/en_US/playlistlayout1.png                      |  Bin 0 -> 26306 bytes
 doc/en_US/playlistlayout2.png                      |  Bin 0 -> 29927 bytes
 doc/en_US/playlistlayout3.png                      |  Bin 0 -> 27061 bytes
 doc/en_US/playlistlayout4.png                      |  Bin 0 -> 29565 bytes
 doc/en_US/playlistmenu.png                         |  Bin 0 -> 8387 bytes
 doc/en_US/playlistpic.png                          |  Bin 0 -> 14004 bytes
 doc/en_US/playlistqueue.png                        |  Bin 0 -> 9724 bytes
 doc/en_US/playlistsearch.png                       |  Bin 0 -> 17122 bytes
 doc/en_US/preferences-other.png                    |  Bin 48312 -> 0 bytes
 doc/en_US/queue.png                                |  Bin 0 -> 29829 bytes
 doc/en_US/queue_example11.png                      |  Bin 41554 -> 0 bytes
 doc/en_US/queue_example12.png                      |  Bin 43778 -> 0 bytes
 doc/en_US/queue_example_2.png                      |  Bin 73016 -> 0 bytes
 doc/en_US/queue_example_4.png                      |  Bin 26882 -> 0 bytes
 doc/en_US/queueend.png                             |  Bin 0 -> 7518 bytes
 doc/en_US/remotecollections_ampache_client.png     |  Bin 63676 -> 63676 bytes
 doc/en_US/remotecollections_ampache_client1.png    |  Bin 20485 -> 25727 bytes
 doc/en_US/remotecollections_ampache_client2.png    |  Bin 50901 -> 50901 bytes
 doc/en_US/remotecollections_client.png             |  Bin 54776 -> 54776 bytes
 doc/en_US/remotecollections_daap.png               |  Bin 20468 -> 20468 bytes
 doc/en_US/remotecollections_daap_config.png        |  Bin 42471 -> 42471 bytes
 doc/en_US/remotecollections_samba_server.png       |  Bin 25597 -> 25597 bytes
 doc/en_US/remotecollections_samba_server1.png      |  Bin 123755 -> 123755 bytes
 doc/en_US/remotecollections_samba_server2.png      |  Bin 24238 -> 24238 bytes
 doc/en_US/remotecollections_samba_server3.png      |  Bin 36703 -> 36703 bytes
 doc/en_US/repeat-menu.png                          |  Bin 5980 -> 0 bytes
 doc/en_US/save-playlist-menu.png                   |  Bin 2856 -> 0 bytes
 doc/en_US/searchincollection.png                   |  Bin 13931 -> 13931 bytes
 doc/en_US/searchincollection_example_editbox.png   |  Bin 50212 -> 50212 bytes
 doc/en_US/searchincollection_example_editbox2.png  |  Bin 23991 -> 23991 bytes
 doc/en_US/settings-internet-amarok.png             |  Bin 79114 -> 79114 bytes
 doc/en_US/sorting.png                              |  Bin 0 -> 11259 bytes
 doc/en_US/sorting2.png                             |  Bin 0 -> 17868 bytes
 doc/en_US/tagedit_fromfile_advanced.png            |  Bin 44635 -> 44635 bytes
 doc/en_US/tagedit_fromfile_advanced_example.png    |  Bin 45899 -> 45899 bytes
 doc/en_US/tagedit_fromfile_basic.png               |  Bin 66170 -> 66170 bytes
 doc/en_US/tagedit_fromfile_basic_example.png       |  Bin 69385 -> 69385 bytes
 doc/en_US/toolbar_main.png                         |  Bin 19535 -> 19535 bytes
 doc/en_US/toolbar_slim.png                         |  Bin 10177 -> 6521 bytes
 doc/en_US/toolmenu.png                             |  Bin 0 -> 5903 bytes
 doc/en_US/tools_bookmarkmanager.png                |  Bin 37319 -> 37319 bytes
 doc/en_US/tools_covermanager.png                   |  Bin 332667 -> 332667 bytes
 doc/en_US/tools_equalizer.png                      |  Bin 16949 -> 16949 bytes
 doc/en_US/tools_scriptmanager.png                  |  Bin 43526 -> 0 bytes
 doc/en_US/track_progression.png                    |  Bin 0 -> 9733 bytes
 doc/en_US/transcode_1.png                          |  Bin 45901 -> 45901 bytes
 doc/en_US/view-media-playlist.png                  |  Bin 1834 -> 1834 bytes
 doc/es/add_dynamic.png                             |  Bin 102406 -> 0 bytes
 doc/es/amarok_playlist.png                         |  Bin 138008 -> 0 bytes
 doc/es/analyzer.png                                |  Bin 6374 -> 0 bytes
 doc/es/buttons.png                                 |  Bin 8001 -> 0 bytes
 doc/es/collection.png                              |  Bin 89824 -> 0 bytes
 doc/es/config_appearance.png                       |  Bin 75907 -> 0 bytes
 doc/es/config_collection.png                       |  Bin 65003 -> 0 bytes
 doc/es/config_engine.png                           |  Bin 84913 -> 0 bytes
 doc/es/config_general.png                          |  Bin 82503 -> 0 bytes
 doc/es/config_osd.png                              |  Bin 67327 -> 0 bytes
 doc/es/config_playback.png                         |  Bin 58180 -> 0 bytes
 doc/es/config_scrobbler.png                        |  Bin 78952 -> 0 bytes
 doc/es/coverman.png                                |  Bin 146519 -> 0 bytes
 doc/es/dynamic_bar.png                             |  Bin 7697 -> 0 bytes
 doc/es/dynamic_settings.png                        |  Bin 14560 -> 0 bytes
 doc/es/equalizer.png                               |  Bin 15851 -> 0 bytes
 doc/es/file_browser.png                            |  Bin 97396 -> 0 bytes
 doc/es/index.docbook                               |14868 ++++++++++-
 doc/es/logo.png                                    |  Bin 3442 -> 0 bytes
 doc/es/media_device.png                            |  Bin 27031 -> 0 bytes
 doc/es/menubar.png                                 |  Bin 1923 -> 0 bytes
 doc/es/musicbrainz.png                             |  Bin 1602 -> 0 bytes
 doc/es/pl_tip1.png                                 |  Bin 7894 -> 0 bytes
 doc/es/play_list.png                               |  Bin 16122 -> 0 bytes
 doc/es/player_window.png                           |  Bin 14203 -> 0 bytes
 doc/es/playlist_browser.png                        |  Bin 103404 -> 0 bytes
 doc/es/playlist_window.png                         |  Bin 67274 -> 0 bytes
 doc/es/queue_manager.png                           |  Bin 19799 -> 0 bytes
 doc/es/rmb_menu.png                                |  Bin 23980 -> 0 bytes
 doc/es/script_manager.png                          |  Bin 25257 -> 0 bytes
 doc/es/status_bar.png                              |  Bin 6521 -> 0 bytes
 doc/es/tab_lyrics.png                              |  Bin 76109 -> 0 bytes
 doc/es/tab_music.png                               |  Bin 138808 -> 0 bytes
 doc/es/tab_wiki.png                                |  Bin 93580 -> 0 bytes
 doc/nl/index.docbook                               | 4977 ++--
 doc/pt/index.docbook                               | 2055 +-
 doc/pt_BR/index.docbook                            |15161 ++++++++++-
 doc/sv/amarok2-4-1configuredialogcollection.png    |  Bin 0 -> 30660 bytes
 doc/sv/amarokbreadcrumb.png                        |  Bin 0 -> 3360 bytes
 doc/sv/amaroknew2-4.png                            |  Bin 0 -> 34603 bytes
 doc/sv/amarokrightmenu.png                         |  Bin 0 -> 7845 bytes
 doc/sv/firstruncollection2.png                     |  Bin 0 -> 11422 bytes
 doc/sv/index.docbook                               |14941 ++++++++++-
 doc/uk/album.png                                   |  Bin 0 -> 12987 bytes
 doc/uk/albumbar.png                                |  Bin 0 -> 7423 bytes
 doc/uk/amarok-contextadd.png                       |  Bin 129745 -> 0 bytes
 doc/uk/amarok-managing-media.png                   |  Bin 28603 -> 61254 bytes
 doc/uk/amarok2-4-playlistsearchfilter.png          |  Bin 13008 -> 0 bytes
 doc/uk/amarok24_toolsmenu_withtwoscripts.png       |  Bin 18049 -> 0 bytes
 doc/uk/amarok_locale_selection.png                 |  Bin 0 -> 34792 bytes
 doc/uk/amarok_playlist.png                         |  Bin 143472 -> 0 bytes
 doc/uk/amarok_playlist_bookmarking.png             |  Bin 9064 -> 0 bytes
 doc/uk/amarok_playlist_contextmenu.png             |  Bin 15809 -> 0 bytes
 doc/uk/amarok_playlist_functions.png               |  Bin 6959 -> 0 bytes
 doc/uk/amarok_playlist_layout_d.png                |  Bin 27202 -> 0 bytes
 doc/uk/amarok_playlist_layout_nog1.png             |  Bin 38981 -> 0 bytes
 doc/uk/amarok_playlist_layout_nog2.png             |  Bin 38071 -> 0 bytes
 doc/uk/amarok_playlist_layout_v.png                |  Bin 39433 -> 0 bytes
 doc/uk/amarok_playlist_search2.png                 |  Bin 123927 -> 0 bytes
 doc/uk/amarok_playlist_sortingleavel.png           |  Bin 31251 -> 0 bytes
 doc/uk/app.png                                     |  Bin 0 -> 57227 bytes
 doc/uk/bookmarking_menu.png                        |  Bin 0 -> 8775 bytes
 doc/uk/context_menu.png                            |  Bin 0 -> 16608 bytes
 doc/uk/favor-menu.png                              |  Bin 6741 -> 0 bytes
 doc/uk/favor.png                                   |  Bin 0 -> 7155 bytes
 doc/uk/index.docbook                               | 2291 +-
 doc/uk/lowerpart.png                               |  Bin 3867 -> 0 bytes
 doc/uk/mediasources4.png                           |  Bin 0 -> 74687 bytes
 ...w_amarok_configuration_options_general_edit.png |  Bin 0 -> 83105 bytes
 ...ok_configuration_options_notifications_edit.png |  Bin 0 -> 71254 bytes
 doc/uk/playlist-album-menu.png                     |  Bin 11177 -> 0 bytes
 doc/uk/playlist-ordering.png                       |  Bin 5657 -> 0 bytes
 doc/uk/playlist.png                                |  Bin 23769 -> 0 bytes
 doc/uk/playlist2.png                               |  Bin 0 -> 115964 bytes
 doc/uk/playlist_save.png                           |  Bin 0 -> 49754 bytes
 doc/uk/playlistlayout1.png                         |  Bin 0 -> 45105 bytes
 doc/uk/playlistlayout2.png                         |  Bin 0 -> 44198 bytes
 doc/uk/playlistlayout3.png                         |  Bin 0 -> 45039 bytes
 doc/uk/playlistlayout4.png                         |  Bin 0 -> 44718 bytes
 doc/uk/playlistmenu.png                            |  Bin 0 -> 17941 bytes
 doc/uk/playlistpic.png                             |  Bin 0 -> 67571 bytes
 doc/uk/playlistqueue.png                           |  Bin 0 -> 15831 bytes
 doc/uk/playlistsearch.png                          |  Bin 0 -> 29930 bytes
 doc/uk/queue.png                                   |  Bin 0 -> 82216 bytes
 doc/uk/queue_example11.png                         |  Bin 39339 -> 0 bytes
 doc/uk/queue_example12.png                         |  Bin 60090 -> 0 bytes
 doc/uk/queue_example_2.png                         |  Bin 98353 -> 0 bytes
 doc/uk/queue_example_4.png                         |  Bin 26359 -> 0 bytes
 doc/uk/queueend.png                                |  Bin 0 -> 32324 bytes
 doc/uk/repeat-menu.png                             |  Bin 17745 -> 0 bytes
 doc/uk/save-playlist-menu.png                      |  Bin 6886 -> 0 bytes
 doc/uk/sorting.png                                 |  Bin 0 -> 6258 bytes
 doc/uk/sorting2.png                                |  Bin 0 -> 28159 bytes
 doc/uk/toolmenu.png                                |  Bin 0 -> 17887 bytes
 doc/uk/track_progression.png                       |  Bin 0 -> 18087 bytes
 po/CMakeLists.txt                                  |  114 +-
 po/af/amarok.po                                    | 9940 ++++----
 po/ar/amarok.po                                    |10953 +++++----
 po/ast/amarok.po                                   | 7578 +++---
 po/be/amarok.po                                    |10104 ++++----
 po/bg/amarok.po                                    | 7068 +++---
 po/bs/amarok.po                                    | 9334 ++++---
 po/ca/amarok.po                                    | 6857 +++---
 po/ca at valencia/amarok.po                           |11319 ++++-----
 po/ca at valencia/amarok_scriptengine_qscript.po      |    6 +-
 po/ca at valencia/amarokcollectionscanner_qt.po       |   41 +-
 po/cs/amarok.po                                    | 7104 +++---
 po/csb/amarok.po                                   | 8061 ++++---
 po/da/amarok.po                                    | 6992 +++---
 po/de/amarok.po                                    | 6458 +++---
 po/de/amarok_scriptengine_qscript.po               |    5 +-
 po/de/amarokcollectionscanner_qt.po                |    3 -
 po/de/amarokpkg.po                                 |    5 +-
 po/el/amarok.po                                    | 7009 +++---
 po/en_GB/amarok.po                                 | 8372 ++++---
 po/eo/amarok.po                                    |10874 +++++----
 po/es/amarok.po                                    | 6497 +++---
 po/es/amarok_scriptengine_qscript.po               |   10 +-
 po/es/amarokcollectionscanner_qt.po                |    8 +-
 po/et/amarok.po                                    | 7200 +++---
 po/et/amarokcollectionscanner_qt.po                |   37 +-
 po/eu/amarok.po                                    | 6949 +++---
 po/fa/amarok.po                                    | 6381 +++---
 po/fi/amarok.po                                    | 8470 ++++---
 po/fr/amarok.po                                    | 8802 ++++---
 po/ga/amarok.po                                    | 8814 ++++----
 po/ga/amarok_scriptengine_qscript.po               |    8 +-
 po/ga/amarokcollectionscanner_qt.po                |    4 +-
 po/ga/amarokpkg.po                                 |   20 +-
 po/gl/amarok.po                                    | 9289 ++++---
 po/gl/amarokpkg.po                                 |   15 +-
 po/he/amarok.po                                    | 8547 ++++---
 po/hu/amarok.po                                    |12129 +++++-----
 po/hu/amarok_scriptengine_qscript.po               |   11 +-
 po/hu/amarokcollectionscanner_qt.po                |   37 +-
 po/hu/amarokpkg.po                                 |   10 +-
 po/is/amarok.po                                    |10667 ++++----
 po/it/amarok.po                                    | 7041 +++---
 po/ja/amarok.po                                    | 8482 ++++---
 po/ja/amarok_scriptengine_qscript.po               |   42 +-
 po/ja/amarokcollectionscanner_qt.po                |   41 +-
 po/ja/amarokpkg.po                                 |   16 +-
 po/km/amarok.po                                    | 8652 ++++---
 po/ko/amarok.po                                    | 8561 ++++---
 po/ku/amarok.po                                    |10179 ++++----
 po/lt/amarok.po                                    | 6552 +++---
 po/lv/amarok.po                                    |15374 +++++------
 po/mai/amarok.po                                   | 6160 +++--
 po/ml/amarok.po                                    | 7336 +++---
 po/ms/amarok.po                                    | 7825 +++---
 po/nb/amarok.po                                    |24979 +++++++++---------
 po/nds/amarok.po                                   | 8319 ++++---
 po/ne/amarok.po                                    |10458 ++++----
 po/nl/amarok.po                                    | 7015 +++---
 po/nn/amarok.po                                    |21383 ++++++++--------
 po/oc/amarok.po                                    | 9062 ++++---
 po/pa/amarok.po                                    | 6554 +++---
 po/pl/amarok.po                                    |10218 ++++----
 po/pl/amarokcollectionscanner_qt.po                |   49 +-
 po/pt/amarok.po                                    | 6310 +++---
 po/pt_BR/amarok.po                                 | 6609 +++---
 po/pt_BR/amarokcollectionscanner_qt.po             |   10 +-
 po/pt_BR/amarokpkg.po                              |   11 +-
 po/ro/amarok.po                                    | 6860 +++---
 po/ru/amarok.po                                    | 7058 +++---
 po/se/amarok.po                                    |20951 ++++++++--------
 po/si/amarok.po                                    | 6284 +++---
 po/sk/amarok.po                                    | 8855 ++++----
 po/sk/amarokcollectionscanner_qt.po                |   10 +-
 po/sk/amarokpkg.po                                 |   10 +-
 po/sl/amarok.po                                    | 9318 ++++---
 po/sq/amarok.po                                    | 6022 +++--
 po/sr/amarok.po                                    |26295 ++++++++++----------
 po/sr at ijekavian/amarok.po                          |26315 ++++++++++----------
 po/sr at ijekavianlatin/amarok.po                     |26291 ++++++++++----------
 po/sr at latin/amarok.po                              |26229 ++++++++++----------
 po/sv/amarok.po                                    | 6638 +++---
 po/tg/amarok.po                                    | 9746 ++++----
 po/th/amarok.po                                    | 9242 ++++----
 po/tr/amarok.po                                    |26972 ++++++++++----------
 po/ug/amarok.po                                    | 6277 +++---
 po/ug/amarok_scriptengine_qscript.po               |   10 +-
 po/ug/amarokcollectionscanner_qt.po                |    2 +-
 po/ug/amarokpkg.po                                 |   20 +-
 po/uk/amarok.po                                    | 6395 +++---
 po/wa/amarok.po                                    | 6925 +++---
 po/zh_CN/amarok.po                                 | 6766 +++---
 po/zh_TW/amarok.po                                 | 6417 +++--
 shared/FileType.cpp                                |    4 +-
 shared/FileType.h                                  |    7 +-
 shared/MetaTagLib.h                                |   22 +-
 shared/MetaValues.h                                |    1 +
 shared/Version.h                                   |    2 +-
 shared/tag_helpers/ASFTagHelper.cpp                |  268 +-
 shared/tag_helpers/ID3v2TagHelper.cpp              |   79 +-
 shared/tag_helpers/MP4TagHelper.cpp                |   34 +-
 shared/tag_helpers/TagHelper.cpp                   |   13 +-
 shared/tag_helpers/TagHelper.h                     |    2 +
 shared/tag_helpers/VorbisCommentTagHelper.cpp      |  183 +-
 shared/tag_helpers/VorbisCommentTagHelper.h        |    9 +
 src/AmarokMimeData.cpp                             |    2 +-
 src/App.cpp                                        |   29 +-
 src/CMakeLists.txt                                 |   50 +-
 src/EngineController.cpp                           |   30 +-
 src/EngineController.h                             |    2 +
 src/MainWindow.cpp                                 |   59 +-
 src/MainWindow.h                                   |    2 +
 src/PluginManager.cpp                              |    4 +-
 src/PluginManager.h                                |    2 +-
 src/ScriptManager.cpp                              |    1 +
 src/amarok-play-audiocd.desktop                    |    1 +
 src/amarok.desktop                                 |   13 +-
 src/amarok_containers.desktop                      |   13 +-
 src/amarok_plugin.desktop                          |    4 +-
 src/amarokconfig.kcfg                              |    4 +
 src/amarokurls/AmarokUrl.cpp                       |    4 +-
 src/amarokurls/AmarokUrl.h                         |    9 +-
 src/amarokurls/BookmarkModel.cpp                   |   38 +
 src/amarokurls/BookmarkModel.h                     |    7 +
 src/amarokurls/BookmarkTreeView.cpp                |    1 -
 src/amarokurls/ContextUrlGenerator.cpp             |    2 +-
 src/amarokurls/NavigationUrlGenerator.cpp          |   26 +-
 src/amarokurls/NavigationUrlRunner.cpp             |    2 +-
 src/amarokurls/PlayUrlGenerator.cpp                |   19 +-
 src/amarokurls/PlayUrlGenerator.h                  |   11 +-
 src/browsers/BrowserCategory.h                     |    9 +-
 src/browsers/BrowserDefines.h                      |   38 +
 src/browsers/CollectionTreeItem.cpp                |   21 +-
 src/browsers/CollectionTreeItem.h                  |   23 +-
 src/browsers/CollectionTreeItemModel.cpp           |   74 +-
 src/browsers/CollectionTreeItemModel.h             |   10 +-
 src/browsers/CollectionTreeItemModelBase.cpp       |   69 +-
 src/browsers/CollectionTreeItemModelBase.h         |   34 +-
 src/browsers/CollectionTreeView.cpp                |  573 +-
 src/browsers/CollectionTreeView.h                  |   17 +-
 src/browsers/SingleCollectionTreeItemModel.cpp     |    5 +-
 src/browsers/SingleCollectionTreeItemModel.h       |    5 +-
 .../CollectionTreeItemDelegate.cpp                 |   25 +-
 .../collectionbrowser/CollectionWidget.cpp         |   36 +-
 src/browsers/collectionbrowser/CollectionWidget.h  |    4 +-
 src/browsers/filebrowser/FileView.cpp              |   40 +-
 src/browsers/filebrowser/FileView.h                |    1 -
 .../playlistbrowser/PlaylistBrowserCategory.cpp    |    3 +-
 .../playlistbrowser/PlaylistBrowserCategory.h      |    2 +-
 .../playlistbrowser/PlaylistBrowserModel.cpp       |   67 +-
 .../playlistbrowser/PlaylistBrowserModel.h         |    1 +
 .../playlistbrowser/PlaylistBrowserView.cpp        |  158 +-
 src/browsers/playlistbrowser/PlaylistBrowserView.h |   19 +-
 .../playlistbrowser/PlaylistsByProviderProxy.cpp   |  236 +-
 .../playlistbrowser/PlaylistsByProviderProxy.h     |   13 +-
 src/browsers/playlistbrowser/QtGroupingProxy.cpp   |   35 +-
 src/browsers/playlistbrowser/QtGroupingProxy.h     |    2 +-
 src/browsers/playlistbrowser/UserPlaylistModel.cpp |   13 +-
 src/browsers/servicebrowser/ServiceBrowser.cpp     |   18 -
 src/browsers/servicebrowser/ServiceBrowser.h       |    3 -
 src/configdialog/ConfigDialog.cpp                  |    2 +-
 src/configdialog/dialogs/CollectionConfig.cpp      |   12 +-
 src/configdialog/dialogs/CollectionConfig.ui       |   33 +
 src/configdialog/dialogs/PluginsConfig.cpp         |    2 +-
 src/context/CMakeLists.txt                         |    1 -
 src/context/ContextView.cpp                        |    7 +-
 src/context/ContextView.h                          |    2 +-
 src/context/ToolbarView.cpp                        |    6 +-
 src/context/applets/CMakeLists.txt                 |    8 +-
 src/context/applets/currenttrack/CurrentTrack.cpp  |    6 +-
 .../amarok-context-applet-currenttrack.desktop     |    1 +
 .../info/amarok-context-applet-info.desktop        |    2 +-
 src/context/applets/labels/LabelsApplet.cpp        |    4 +-
 .../labels/amarok-context-applet-labels.desktop    |    2 +
 src/context/applets/lyrics/LyricsApplet.cpp        |   15 +-
 .../applets/similarartists/ArtistWidget.cpp        |    2 +-
 .../amarok-context-applet-similarArtists.desktop   |    1 +
 .../amarok-context-applet-songkick.desktop         |    1 +
 .../applets/spectrumanalyzer/CMakeLists.txt        |    8 +-
 ...amarok-context-applet-spectrum-analyzer.desktop |    6 +
 .../tabs/amarok-context-applet-tabs.desktop        |    2 +
 .../upcomingevents/UpcomingEventsApplet.cpp        |    2 +-
 .../amarok-context-applet-upcomingEvents.desktop   |    1 +
 src/context/applets/videoclip/CMakeLists.txt       |   34 -
 .../applets/videoclip/CustomVideoWidget.cpp        |  113 -
 src/context/applets/videoclip/CustomVideoWidget.h  |   53 -
 src/context/applets/videoclip/VideoItemButton.cpp  |  132 -
 src/context/applets/videoclip/VideoItemButton.h    |   64 -
 src/context/applets/videoclip/VideoclipApplet.cpp  |  538 -
 src/context/applets/videoclip/VideoclipApplet.h    |  112 -
 .../amarok-context-applet-videoclip.desktop        |   65 -
 .../videoclip/amarok-videoclip-dailymotion.png     |  Bin 2480 -> 0 bytes
 .../applets/videoclip/amarok-videoclip-vimeo.png   |  Bin 2753 -> 0 bytes
 .../applets/videoclip/amarok-videoclip-youtube.png |  Bin 1862 -> 0 bytes
 src/context/applets/videoclip/videoclipSettings.ui |   28 -
 src/context/engines/CMakeLists.txt                 |    7 +-
 .../current/amarok-data-engine-current.desktop     |    2 +-
 .../engines/info/amarok-data-engine-info.desktop   |    1 +
 .../labels/amarok-data-engine-labels.desktop       |    3 +
 src/context/engines/lyrics/LyricsEngine.cpp        |    5 +-
 .../lyrics/amarok-data-engine-lyrics.desktop       |    2 +-
 .../photos/amarok-data-engine-photos.desktop       |    3 +-
 .../amarok-data-engine-similarArtists.desktop      |    3 +-
 .../songkick/amarok-data-engine-songkick.desktop   |    2 +-
 .../amarok-data-engine-spectrum-analyzer.desktop   |    6 +
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    2 +
 .../amarok-data-engine-upcomingEvents.desktop      |    3 +-
 src/context/engines/videoclip/CMakeLists.txt       |   15 -
 src/context/engines/videoclip/VideoclipEngine.cpp  |  756 -
 src/context/engines/videoclip/VideoclipEngine.h    |  185 -
 src/context/engines/videoclip/VideoclipInfo.h      |   40 -
 .../videoclip/amarok-data-engine-videoclip.desktop |   54 -
 .../wikipedia/amarok-data-engine-wikipedia.desktop |    2 +-
 ...k-scriptengine-applet-simple-javascript.desktop |    3 +-
 .../amarok-scriptengine-runner-javascript.desktop  |    3 +-
 src/context/scriptengine/javascript/qtgui/rect.cpp |   12 -
 .../servicetypes/amarok_data_engine.desktop        |    4 +-
 src/context/toolbar/AppletToolbar.cpp              |   13 +
 src/context/toolbar/AppletToolbar.h                |    3 +
 .../capabilities/AlbumActionsCapability.cpp        |   87 +
 .../capabilities/AlbumActionsCapability.h          |   44 +
 .../timecode/TimecodeEditCapability.cpp            |    6 -
 .../capabilities/timecode/TimecodeEditCapability.h |    1 -
 .../collections/audiocd/AudioCdCollection.cpp      |   19 +-
 .../collections/audiocd/AudioCdCollection.h        |    2 +-
 .../audiocd/AudioCdCollectionLocation.cpp          |    2 +-
 .../audiocd/AudioCdCollectionLocation.h            |    9 +-
 src/core-impl/collections/audiocd/AudioCdMeta.cpp  |   38 +-
 src/core-impl/collections/audiocd/AudioCdMeta.h    |    5 +-
 .../amarok_collection-audiocdcollection.desktop    |    4 +-
 src/core-impl/collections/daap/DaapMeta.cpp        |    6 -
 src/core-impl/collections/daap/DaapMeta.h          |    1 -
 .../daap/amarok_collection-daapcollection.desktop  |    4 +-
 .../collections/daap/daapreader/Reader.cpp         |   37 +-
 src/core-impl/collections/db/DatabaseCollection.h  |    4 +-
 src/core-impl/collections/db/DatabaseMeta.h        |  568 -
 src/core-impl/collections/db/ScanManager.cpp       |    9 +-
 src/core-impl/collections/db/ScanManager.h         |    2 +-
 .../collections/db/ScanResultProcessor.cpp         |   24 +-
 src/core-impl/collections/db/sql/CMakeLists.txt    |    1 -
 .../collections/db/sql/CapabilityDelegateImpl.cpp  |   80 +-
 .../collections/db/sql/DatabaseUpdater.cpp         |   54 +-
 src/core-impl/collections/db/sql/DatabaseUpdater.h |   16 +-
 src/core-impl/collections/db/sql/SqlCollection.cpp |  119 +-
 src/core-impl/collections/db/sql/SqlCollection.h   |   19 +-
 .../collections/db/sql/SqlCollectionLocation.cpp   |  104 +-
 .../collections/db/sql/SqlCollectionLocation.h     |   14 +-
 src/core-impl/collections/db/sql/SqlMeta.cpp       |   41 +-
 src/core-impl/collections/db/sql/SqlMeta.h         |   13 +-
 .../massstorage/amarok_device_massstorage.desktop  |  147 +-
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |  143 +-
 .../db/sql/device/smb/amarok_device_smb.desktop    |  142 +-
 .../amarok_collection-mysqlecollection.desktop     |    5 +-
 .../MySqlServerCollection.cpp                      |    3 +-
 ...amarok_collection-mysqlservercollection.desktop |    5 +-
 .../collections/ipodcollection/CMakeLists.txt      |   66 +-
 .../collections/ipodcollection/IpodCollection.cpp  |  645 +-
 .../collections/ipodcollection/IpodCollection.h    |  260 +-
 .../ipodcollection/IpodCollectionFactory.cpp       |  284 +
 .../ipodcollection/IpodCollectionFactory.h         |   93 +
 .../ipodcollection/IpodCollectionLocation.cpp      |  152 +
 .../ipodcollection/IpodCollectionLocation.h        |   75 +
 .../collections/ipodcollection/IpodMeta.cpp        |  884 +
 .../collections/ipodcollection/IpodMeta.h          |  329 +
 .../ipodcollection/IpodMetaEditCapability.cpp      |  141 +
 .../ipodcollection/IpodMetaEditCapability.h        |   63 +
 .../collections/ipodcollection/IpodPlaylist.cpp    |  248 +
 .../collections/ipodcollection/IpodPlaylist.h      |  113 +
 .../ipodcollection/IpodPlaylistProvider.cpp        |  497 +
 .../ipodcollection/IpodPlaylistProvider.h          |  123 +
 .../amarok_collection-ipodcollection.desktop       |  149 +-
 ...g-gdk.h.cmake => config-ipodcollection.h.cmake} |    0
 .../ipodcollection/handler/IpodHandler.cpp         | 2424 --
 .../ipodcollection/handler/IpodHandler.h           |  468 -
 .../handler/capabilities/IpodArtworkCapability.cpp |   60 -
 .../handler/capabilities/IpodArtworkCapability.h   |   52 -
 .../capabilities/IpodPlaylistCapability.cpp        |  120 -
 .../handler/capabilities/IpodPlaylistCapability.h  |   61 -
 .../handler/capabilities/IpodReadCapability.cpp    |  196 -
 .../handler/capabilities/IpodReadCapability.h      |   77 -
 .../handler/capabilities/IpodWriteCapability.cpp   |  227 -
 .../handler/capabilities/IpodWriteCapability.h     |   85 -
 .../ipodcollection/jobs/IpodCopyTracksJob.cpp      |  401 +
 .../ipodcollection/jobs/IpodCopyTracksJob.h        |  108 +
 .../ipodcollection/jobs/IpodDeleteTracksJob.cpp    |   69 +
 .../ipodcollection/jobs/IpodDeleteTracksJob.h      |   46 +
 .../ipodcollection/jobs/IpodParseTracksJob.cpp     |   83 +
 .../ipodcollection/jobs/IpodParseTracksJob.h       |   49 +
 .../ipodcollection/jobs/IpodWriteDatabaseJob.cpp   |   33 +
 .../ipodcollection/jobs/IpodWriteDatabaseJob.h     |   37 +
 .../ipodcollection/support/IphoneMountPoint.cpp    |  156 +
 .../ipodcollection/support/IphoneMountPoint.h      |   73 +
 .../ipodcollection/support/IpodConfiguration.ui    |  229 +
 .../support/IpodConnectionAssistant.cpp            |  129 -
 .../support/IpodConnectionAssistant.h              |   36 -
 .../ipodcollection/support/IpodDeviceHelper.cpp    |  466 +
 .../ipodcollection/support/IpodDeviceHelper.h      |  102 +
 .../ipodcollection/support/IpodDeviceInfo.cpp      |   67 -
 .../ipodcollection/support/IpodDeviceInfo.h        |   39 -
 .../support/IpodTranscodeCapability.cpp            |   58 +
 .../support/IpodTranscodeCapability.h              |   49 +
 .../mediadevicecollection/MediaDeviceCollection.h  |    4 +-
 .../MediaDeviceCollectionLocation.cpp              |   59 +-
 .../MediaDeviceCollectionLocation.h                |   10 +-
 .../MediaDeviceEditCapability.cpp                  |  131 +
 .../MediaDeviceEditCapability.h                    |   67 +
 .../mediadevicecollection/MediaDeviceMeta.cpp      |  163 +-
 .../mediadevicecollection/MediaDeviceMeta.h        |   23 +-
 ...amarok_collection-mediadevicecollection.desktop |    4 +-
 .../handler/MediaDeviceHandler.cpp                 |  399 +-
 .../handler/MediaDeviceHandler.h                   |  109 +-
 .../handler/capabilities/CustomReadCapability.cpp  |   23 -
 .../handler/capabilities/CustomReadCapability.h    |   45 -
 .../handler/capabilities/ReadCapability.cpp        |    6 +
 .../handler/capabilities/ReadCapability.h          |   73 +-
 .../handler/capabilities/ReadCapabilityBase.cpp    |   23 -
 .../handler/capabilities/ReadCapabilityBase.h      |  101 -
 .../handler/capabilities/WriteCapability.cpp       |    7 +
 .../handler/capabilities/WriteCapability.h         |   74 +-
 .../handler/capabilities/WriteCapabilityBase.cpp   |   24 -
 .../handler/capabilities/WriteCapabilityBase.h     |  106 -
 .../playlist/MediaDeviceUserPlaylistProvider.h     |    1 -
 .../amarok_collection-mtpcollection.desktop        |    4 +-
 .../mtpcollection/handler/MtpHandler.cpp           |    7 -
 .../collections/mtpcollection/handler/MtpHandler.h |    1 -
 .../amarok_collection-nepomukcollection.desktop    |    2 +-
 .../playdarcollection/PlaydarCollection.cpp        |    6 +-
 .../amarok_collection-playdarcollection.desktop    |    7 +-
 .../proxycollection/ProxyCollectionMeta.cpp        |    1 -
 src/core-impl/collections/support/ArtistHelper.cpp |   26 +
 src/core-impl/collections/support/ArtistHelper.h   |   14 +-
 .../support/CollectionLocationDelegateImpl.cpp     |  155 +-
 .../support/CollectionLocationDelegateImpl.h       |    9 +
 .../collections/support/CollectionManager.cpp      |    9 +-
 .../collections/support/FileCollectionLocation.cpp |   29 +-
 .../collections/support/FileCollectionLocation.h   |    4 +-
 .../collections/support/MemoryCollection.h         |   69 +-
 .../collections/support/MemoryMatcher.cpp          |    4 +-
 src/core-impl/collections/support/MemoryMeta.cpp   |  514 +
 src/core-impl/collections/support/MemoryMeta.h     |  344 +-
 .../collections/support/PlaylistCollection.cpp     |    2 +-
 .../collections/support/PlaylistCollection.h       |    2 +-
 .../support/PlaylistCollectionLocation.h           |    2 +-
 .../collections/support/TextualQueryFilter.cpp     |   73 +-
 .../collections/support/TextualQueryFilter.h       |    3 +-
 .../support/TrashCollectionLocation.cpp            |    6 +-
 .../collections/support/TrashCollectionLocation.h  |    4 +-
 .../collections/support/jobs/WriteTagsJob.cpp      |   38 +
 .../collections/support/jobs/WriteTagsJob.h        |   50 +
 .../collections/umscollection/CMakeLists.txt       |    2 +
 .../collections/umscollection/UmsCollection.cpp    |  503 +-
 .../collections/umscollection/UmsCollection.h      |  114 +-
 .../umscollection/UmsCollectionLocation.cpp        |  152 +-
 .../umscollection/UmsCollectionLocation.h          |   32 +-
 .../collections/umscollection/UmsConfiguration.ui  |  177 +-
 .../umscollection/UmsTranscodeCapability.cpp       |   51 +
 .../umscollection/UmsTranscodeCapability.h         |   41 +
 .../amarok_collection-umscollection.desktop        |    2 +-
 .../collections/upnpcollection/UpnpCache.cpp       |   20 +-
 .../collections/upnpcollection/UpnpCache.h         |    6 +-
 .../upnpcollection/UpnpCollectionFactory.cpp       |  126 +-
 .../upnpcollection/UpnpCollectionFactory.h         |    6 +
 .../collections/upnpcollection/UpnpMeta.cpp        |   14 +-
 .../collections/upnpcollection/UpnpMeta.h          |    1 -
 .../amarok_collection-upnpcollection.desktop       |    4 +-
 .../collections/upnpcollection/dbuscodec.cpp       |    4 +-
 .../collections/upnpcollection/dbuscodec.h         |    5 +-
 .../collections/upnpcollection/deviceinfo.h        |   43 +-
 src/core-impl/logger/ProxyLogger.cpp               |   64 +-
 src/core-impl/logger/ProxyLogger.h                 |   10 +-
 src/core-impl/meta/file/File.cpp                   |   52 +-
 src/core-impl/meta/file/File.h                     |   46 +-
 src/core-impl/meta/file/File_p.h                   |  109 +-
 src/core-impl/meta/proxy/MetaProxy.cpp             |  167 +-
 src/core-impl/meta/proxy/MetaProxy.h               |   97 +-
 src/core-impl/meta/proxy/MetaProxyWorker.cpp       |   82 +
 src/core-impl/meta/proxy/MetaProxyWorker.h         |   42 +
 src/core-impl/meta/proxy/MetaProxy_p.h             |  142 +-
 src/core-impl/meta/stream/Stream_p.h               |   46 +-
 src/core-impl/meta/timecode/TimecodeMeta.cpp       |   56 +-
 src/core-impl/meta/timecode/TimecodeMeta.h         |    3 +-
 .../providers/user/UserPlaylistProvider.cpp        |  163 +-
 .../providers/user/UserPlaylistProvider.h          |   30 +-
 src/core-impl/playlists/types/file/PlaylistFile.h  |    6 +
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |   65 +-
 .../playlists/types/file/pls/PLSPlaylist.cpp       |  137 +-
 .../playlists/types/file/xspf/XSPFPlaylist.cpp     |   90 +-
 src/core/CMakeLists.txt                            |    2 +-
 src/core/capabilities/ActionsCapability.h          |   18 +-
 src/core/capabilities/Capability.h                 |    3 +-
 src/core/capabilities/EditCapability.h             |   36 +-
 src/core/capabilities/TranscodeCapability.cpp      |   24 +
 src/core/capabilities/TranscodeCapability.h        |   84 +
 src/core/capabilities/UpdateCapability.cpp         |   23 -
 src/core/capabilities/UpdateCapability.h           |   46 -
 src/core/collections/Collection.cpp                |   14 +-
 src/core/collections/Collection.h                  |    2 +-
 src/core/collections/CollectionLocation.cpp        |  184 +-
 src/core/collections/CollectionLocation.h          |  129 +-
 src/core/collections/CollectionLocationDelegate.h  |   22 +
 src/core/collections/QueryMaker.h                  |    3 +
 src/core/collections/support/TrackForUrlWorker.cpp |   14 +-
 src/core/collections/support/TrackForUrlWorker.h   |   12 +-
 src/core/meta/Meta.h                               |   13 +
 src/core/meta/support/MetaConstants.cpp            |    2 +-
 src/core/meta/support/MetaKeys.cpp                 |   18 +-
 src/core/meta/support/MetaKeys.h                   |    9 +-
 src/core/meta/support/MetaUtility.cpp              |   14 +-
 src/core/playlists/Playlist.h                      |   11 +
 src/core/playlists/PlaylistProvider.h              |    2 +
 src/core/support/Amarok.cpp                        |    2 +-
 src/core/support/Components.h                      |   28 +-
 src/core/transcoding/TranscodingConfiguration.cpp  |  115 +-
 src/core/transcoding/TranscodingConfiguration.h    |   45 +-
 src/core/transcoding/TranscodingController.cpp     |   33 +-
 src/core/transcoding/TranscodingController.h       |   30 +-
 src/core/transcoding/TranscodingDefines.h          |   23 +-
 src/core/transcoding/TranscodingFormat.h           |    4 +-
 src/core/transcoding/TranscodingProperty.cpp       |   63 +-
 src/core/transcoding/TranscodingProperty.h         |   51 +-
 .../transcoding/formats/TranscodingNullFormat.cpp  |   10 +-
 .../transcoding/formats/TranscodingNullFormat.h    |    2 +-
 src/covermanager/CoverFetchingActions.cpp          |   13 +-
 src/data/amarok.notifyrc                           |    1 +
 src/data/first_run_jingle.ogg                      |  Bin 1600632 -> 551201 bytes
 src/dbus/mpris2/DBusAbstractAdaptor.cpp            |  112 +
 src/dbus/mpris2/DBusAbstractAdaptor.h              |   86 +
 src/dbus/mpris2/DBusAmarokApp.cpp                  |   49 +
 src/dbus/mpris2/DBusAmarokApp.h                    |   47 +
 src/dbus/mpris2/MediaPlayer2.cpp                   |  116 +
 src/dbus/mpris2/MediaPlayer2.h                     |   69 +
 src/dbus/mpris2/MediaPlayer2AmarokExtensions.cpp   |   72 +
 src/dbus/mpris2/MediaPlayer2AmarokExtensions.h     |   54 +
 src/dbus/mpris2/MediaPlayer2Player.cpp             |  416 +
 src/dbus/mpris2/MediaPlayer2Player.h               |  116 +
 src/dbus/mpris2/Mpris2.cpp                         |   66 +
 src/dbus/mpris2/Mpris2.h                           |   38 +
 src/dbus/mpris2/Mpris2DBusHandler.cpp              |  514 -
 src/dbus/mpris2/Mpris2DBusHandler.h                |  196 -
 src/dbus/mpris2/org.mpris.MediaPlayer2.Player.xml  |   91 -
 src/dbus/mpris2/org.mpris.MediaPlayer2.root.xml    |   25 -
 src/dialogs/CollectionSetup.cpp                    |   41 +-
 src/dialogs/CollectionSetup.h                      |   10 +-
 src/dialogs/DiagnosticDialog.cpp                   |  136 +
 src/dialogs/DiagnosticDialog.h                     |   46 +
 src/dialogs/EditFilterDialog.cpp                   |  117 +-
 src/dialogs/EditFilterDialog.ui                    |    2 +-
 src/dialogs/EqualizerDialog.cpp                    |   30 +-
 src/dialogs/FilenameLayoutDialog.ui                |    2 +-
 src/dialogs/TagDialog.cpp                          |    8 +-
 src/dynamic/DynamicModel.cpp                       |    5 +
 src/dynamic/biases/AlbumPlayBias.cpp               |   27 +-
 src/dynamic/biases/AlbumPlayBias.h                 |    1 +
 src/dynamic/biases/IfElseBias.cpp                  |    2 +-
 src/dynamic/biases/QuizPlayBias.cpp                |    9 +-
 src/firstruntutorial/FirstRunTutorial.cpp          |  227 -
 src/firstruntutorial/FirstRunTutorial.h            |   64 -
 src/firstruntutorial/FirstRunTutorialPage.cpp      |  131 -
 src/firstruntutorial/FirstRunTutorialPage.h        |   51 -
 src/images/CMakeLists.txt                          |    2 -
 src/images/FilenameLayoutDialogHint.png            |  Bin 1287 -> 0 bytes
 src/images/emblem-amazon-scalable.svgz             |  Bin 1647 -> 2478 bytes
 src/images/emblem-amazon.png                       |  Bin 630 -> 576 bytes
 src/images/icons/hi16-action-amarok_mostplayed.png |  Bin 941 -> 0 bytes
 .../icons/hi16-action-emblem-favorite-amarok.png   |  Bin 925 -> 0 bytes
 .../icons/hi16-action-filename-last-played.png     |  Bin 0 -> 801 bytes
 src/images/icons/hi16-action-label-amarok.png      |  Bin 0 -> 720 bytes
 .../hi16-action-media-album-shuffle-amarok.png     |  Bin 483 -> 0 bytes
 ...i16-action-media-playlist-repeat-off-amarok.png |  Bin 829 -> 0 bytes
 ...16-action-media-playlist-shuffle-off-amarok.png |  Bin 483 -> 0 bytes
 .../hi16-action-media-track-repeat-amarok.png      |  Bin 910 -> 0 bytes
 .../hi16-action-view-services-amazon-amarok.png    |  Bin 523 -> 576 bytes
 ...6-action-view-services-jamendo-black-amarok.png |  Bin 528 -> 0 bytes
 src/images/icons/hi22-action-amarok_mostplayed.png |  Bin 1441 -> 0 bytes
 .../icons/hi22-action-emblem-favorite-amarok.png   |  Bin 1364 -> 0 bytes
 .../hi22-action-media-album-shuffle-amarok.png     |  Bin 638 -> 0 bytes
 ...i22-action-media-playlist-repeat-off-amarok.png |  Bin 1228 -> 0 bytes
 ...22-action-media-playlist-shuffle-off-amarok.png |  Bin 638 -> 0 bytes
 .../hi22-action-media-track-repeat-amarok.png      |  Bin 1349 -> 0 bytes
 .../hi22-action-view-services-amazon-amarok.png    |  Bin 633 -> 1097 bytes
 ...2-action-view-services-jamendo-black-amarok.png |  Bin 736 -> 0 bytes
 src/images/icons/hi32-action-amarok_mostplayed.png |  Bin 2338 -> 0 bytes
 .../icons/hi32-action-emblem-favorite-amarok.png   |  Bin 2290 -> 0 bytes
 .../hi32-action-media-album-shuffle-amarok.png     |  Bin 891 -> 0 bytes
 ...i32-action-media-playlist-repeat-off-amarok.png |  Bin 2043 -> 0 bytes
 ...32-action-media-playlist-shuffle-off-amarok.png |  Bin 891 -> 0 bytes
 .../hi32-action-media-track-repeat-amarok.png      |  Bin 2163 -> 0 bytes
 .../hi32-action-view-services-amazon-amarok.png    |  Bin 1008 -> 1496 bytes
 ...2-action-view-services-jamendo-black-amarok.png |  Bin 1037 -> 0 bytes
 src/images/icons/hi48-action-amarok_mostplayed.png |  Bin 4288 -> 0 bytes
 .../icons/hi48-action-emblem-favorite-amarok.png   |  Bin 4110 -> 0 bytes
 .../hi48-action-media-album-shuffle-amarok.png     |  Bin 3500 -> 0 bytes
 ...i48-action-media-playlist-repeat-off-amarok.png |  Bin 3672 -> 0 bytes
 ...48-action-media-playlist-shuffle-off-amarok.png |  Bin 1470 -> 0 bytes
 .../hi48-action-media-track-repeat-amarok.png      |  Bin 3881 -> 0 bytes
 .../hi48-action-view-services-amazon-amarok.png    |  Bin 1474 -> 2381 bytes
 ...8-action-view-services-jamendo-black-amarok.png |  Bin 1580 -> 0 bytes
 .../svg/action-view-services-amazon-amarok.svgz    |  Bin 11090 -> 13070 bytes
 .../svg/hi16-action-filename-last-played.svgz      |  Bin 0 -> 157054 bytes
 src/images/pud_items.svg                           | 1460 +-
 src/images/splash-screen.png                       |  Bin 198970 -> 0 bytes
 src/images/web_applet_background.svg               |  674 -
 src/likeback/LikeBackDialog.cpp                    |    6 +-
 src/main.cpp                                       |   11 +-
 src/musicbrainz/MusicDNSAudioDecoder.cpp           |   17 +-
 src/playlist/PlaylistActions.cpp                   |   21 +-
 src/playlist/PlaylistController.cpp                |   12 +-
 src/playlist/PlaylistDock.cpp                      |   42 +-
 src/playlist/PlaylistDock.h                        |    2 +
 src/playlist/PlaylistModel.cpp                     |   48 +-
 src/playlist/PlaylistViewUrlGenerator.cpp          |    8 +-
 src/playlist/layouts/PlaylistLayoutEditDialog.ui   |    2 +-
 .../navigators/FavoredRandomTrackNavigator.cpp     |   81 +-
 .../navigators/FavoredRandomTrackNavigator.h       |    5 +-
 src/playlist/view/listview/PrettyListView.cpp      |   35 +-
 src/playlist/view/listview/PrettyListView.h        |    4 +
 src/playlistgenerator/ConstraintSolver.cpp         |    2 +
 src/playlistmanager/PlaylistManager.cpp            |   39 +-
 src/playlistmanager/PlaylistManager.h              |   13 +-
 src/playlistmanager/file/PlaylistFileProvider.cpp  |  197 +-
 src/playlistmanager/file/PlaylistFileProvider.h    |   15 -
 src/playlistmanager/sql/SqlPlaylist.cpp            |   59 +-
 .../sql/SqlUserPlaylistProvider.cpp                |  215 +-
 src/playlistmanager/sql/SqlUserPlaylistProvider.h  |   17 +-
 src/scripts/CMakeLists.txt                         |    1 +
 .../free_music_charts_service/CMakeLists.txt       |    9 +
 .../COPYING                                        |    0
 src/scripts/free_music_charts_service/ChangeLog    |   53 +
 .../free_music_charts_service/FMCEmblem.png        |  Bin 0 -> 654 bytes
 src/scripts/free_music_charts_service/FMCIcon.png  |  Bin 0 -> 5774 bytes
 src/scripts/free_music_charts_service/FMCIcon.xcf  |  Bin 0 -> 10421 bytes
 src/scripts/free_music_charts_service/FMCShow.png  |  Bin 0 -> 12201 bytes
 src/scripts/free_music_charts_service/FMCShow.xcf  |  Bin 0 -> 25094 bytes
 src/scripts/free_music_charts_service/README       |   24 +
 src/scripts/free_music_charts_service/TODO         |   10 +
 src/scripts/free_music_charts_service/main.js      |  350 +
 src/scripts/free_music_charts_service/script.spec  |   17 +
 src/scripts/radio_station_service/main.js          |    2 +-
 src/services/ServiceBase.cpp                       |   16 +-
 src/services/ServiceBase.h                         |    4 +-
 src/services/ServiceCapabilities.cpp               |    4 +-
 src/services/ServiceCollection.cpp                 |    2 +-
 src/services/ServiceCollection.h                   |    2 +-
 src/services/ServiceCollectionLocation.cpp         |    6 +-
 src/services/ServiceCollectionLocation.h           |    3 +-
 src/services/ServiceMetaBase.cpp                   |   17 +-
 src/services/ServiceMetaBase.h                     |    4 +-
 src/services/amazon/Amazon.h                       |    2 +-
 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           |   12 +-
 src/services/amazon/AmazonCollection.h             |   12 +-
 src/services/amazon/AmazonConfig.h                 |   12 +-
 src/services/amazon/AmazonConfigWidget.ui          |   35 +-
 src/services/amazon/AmazonItemTreeModel.cpp        |   24 +-
 src/services/amazon/AmazonItemTreeView.cpp         |   24 +-
 src/services/amazon/AmazonItemTreeView.h           |    2 +
 src/services/amazon/AmazonMeta.cpp                 |    6 +-
 src/services/amazon/AmazonMeta.h                   |    7 +-
 src/services/amazon/AmazonParser.cpp               |   28 +-
 src/services/amazon/AmazonParser.h                 |   13 +-
 src/services/amazon/AmazonSettingsModule.cpp       |   22 +-
 src/services/amazon/AmazonShoppingCart.cpp         |  130 +
 src/services/amazon/AmazonShoppingCart.h           |   79 +
 src/services/amazon/AmazonShoppingCartDialog.cpp   |   14 +-
 src/services/amazon/AmazonShoppingCartItem.cpp     |   42 +
 src/services/amazon/AmazonShoppingCartItem.h       |   48 +
 src/services/amazon/AmazonShoppingCartModel.cpp    |    4 +-
 src/services/amazon/AmazonStore.cpp                |  153 +-
 src/services/amazon/AmazonStore.h                  |   12 +-
 src/services/amazon/CMakeLists.txt                 |    4 +-
 .../amazon/amarok_service_amazonstore.desktop      |   14 +-
 .../amarok_service_amazonstore_config.desktop      |    7 +
 src/services/ampache/AmpacheService.cpp            |    2 +-
 src/services/ampache/AmpacheServiceCollection.cpp  |   79 +-
 src/services/ampache/AmpacheServiceCollection.h    |   22 +-
 src/services/ampache/AmpacheServiceQueryMaker.cpp  |    4 +-
 .../ampache/amarok_service_ampache.desktop         |    2 +-
 src/services/gpodder/GpodderConfigWidget.ui        |    3 +
 .../gpodder/amarok_service_gpodder.desktop         |    9 +-
 .../gpodder/amarok_service_gpodder_config.desktop  |   16 +
 src/services/jamendo/JamendoService.cpp            |    2 +-
 src/services/jamendo/JamendoXmlParser.cpp          |    5 +-
 .../jamendo/amarok_service_jamendo.desktop         |    2 +-
 src/services/lastfm/LastFmConfigWidget.ui          |    6 +
 src/services/lastfm/amarok_service_lastfm.desktop  |    4 +-
 .../lastfm/amarok_service_lastfm_config.desktop    |    2 +-
 .../magnatune/MagnatuneCollectionLocation.cpp      |   10 +-
 .../magnatune/MagnatuneCollectionLocation.h        |    2 +-
 src/services/magnatune/MagnatuneSqlCollection.cpp  |    2 +-
 src/services/magnatune/MagnatuneSqlCollection.h    |    2 +-
 src/services/magnatune/MagnatuneStore.cpp          |    2 +-
 .../amarok_service_magnatunestore.desktop          |    2 +-
 src/services/mp3tunes/Mp3tunesConfigWidget.ui      |    3 +
 src/services/mp3tunes/Mp3tunesService.cpp          |    2 +-
 .../mp3tunes/Mp3tunesServiceCollection.cpp         |    2 +-
 src/services/mp3tunes/Mp3tunesServiceCollection.h  |    2 +-
 .../mp3tunes/Mp3tunesServiceCollectionLocation.cpp |   11 +-
 .../mp3tunes/Mp3tunesServiceCollectionLocation.h   |    5 +-
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    4 +-
 .../amarok_service_mp3tunes_config.desktop         |    1 +
 .../amarok_service_opmldirectory.desktop           |    2 +-
 src/services/scriptable/ScriptableService.cpp      |    2 +-
 src/themes/CMakeLists.txt                          |    1 -
 src/themes/context/Amarok-Mockup/CMakeLists.txt    |    3 -
 src/themes/context/Amarok-Mockup/colors            |   81 -
 src/themes/context/Amarok-Mockup/metadata.desktop  |  110 -
 .../context/Amarok-Mockup/widgets/background.svg   | 1131 -
 .../Amarok-Mockup/widgets/text-background.svgz     |  Bin 3490 -> 0 bytes
 src/themes/context/CMakeLists.txt                  |    1 -
 src/transcoding/CMakeLists.txt                     |    3 +-
 src/transcoding/TranscodingAssistantDialog.cpp     |  166 +-
 src/transcoding/TranscodingAssistantDialog.h       |   34 +-
 src/transcoding/TranscodingAssistantDialog.ui      |  453 +-
 src/transcoding/TranscodingJob.cpp                 |   53 +-
 src/transcoding/TranscodingJob.h                   |   21 +-
 .../TranscodingOptionsStackedWidget.cpp            |    5 +-
 .../TranscodingPropertyComboBoxWidget.cpp          |   62 -
 .../TranscodingPropertyComboBoxWidget.h            |   51 -
 .../TranscodingPropertySliderWidget.cpp            |   16 +-
 .../TranscodingPropertySpinBoxWidget.cpp           |   60 -
 src/transcoding/TranscodingPropertySpinBoxWidget.h |   50 -
 src/transcoding/TranscodingPropertyWidget.cpp      |    6 -
 src/transcoding/TranscodingSelectConfigWidget.cpp  |   81 +
 src/transcoding/TranscodingSelectConfigWidget.h    |   73 +
 src/widgets/AmarokContextMenu.cpp                  |  103 +
 src/widgets/AmarokContextMenu.h                    |   60 +
 src/widgets/BookmarkTriangle.cpp                   |   64 +-
 src/widgets/BookmarkTriangle.h                     |   26 +-
 src/widgets/MetaQueryWidget.cpp                    |  214 +-
 src/widgets/MetaQueryWidget.h                      |    3 +-
 src/widgets/PrettyTreeView.cpp                     |   18 +
 src/widgets/PrettyTreeView.h                       |    4 +
 src/widgets/SliderWidget.cpp                       |   12 +-
 src/widgets/TokenPool.cpp                          |    6 +-
 src/widgets/TrackSelectWidget.cpp                  |    5 +-
 tests/CMakeLists.txt                               |    8 +
 tests/TestTrackOrganizer.cpp                       |    6 +-
 tests/amarokurls/TestAmarokUrls.cpp                |    4 +-
 .../browsers/TestSingleCollectionTreeItemModel.cpp |   10 +-
 .../core-impl/collections/db/sql/TestSqlAlbum.cpp  |    2 -
 .../db/sql/TestSqlCollectionLocation.cpp           |    1 +
 .../collections/db/sql/TestSqlScanManager.cpp      |   13 +-
 .../proxycollection/TestProxyCollectionMeta.cpp    |    1 -
 tests/core-impl/meta/file/TestMetaFileTrack.cpp    |   12 +-
 .../playlists/types/file/m3u/TestM3UPlaylist.cpp   |   23 +-
 .../playlists/types/file/pls/TestPLSPlaylist.cpp   |    3 +-
 .../collections/MockCollectionLocationDelegate.h   |    3 +
 tests/data/playlists/test.m3u                      |   23 +-
 tests/data/services/amazon/searchresponse.xml      |  489 +
 tests/dynamic/TestDynamicModel.cpp                 |  104 +-
 tests/dynamic/TestDynamicModel.h                   |   12 +-
 .../sql/TestSqlUserPlaylistProvider.cpp            |   29 +-
 .../sql/TestSqlUserPlaylistProvider.h              |    2 +-
 tests/services/CMakeLists.txt                      |    1 +
 tests/services/amazon/CMakeLists.txt               |  153 +
 tests/services/amazon/TestAmazonAlbum.cpp          |   54 +
 tests/services/amazon/TestAmazonAlbum.h            |   32 +
 tests/services/amazon/TestAmazonArtist.cpp         |   46 +
 tests/services/amazon/TestAmazonArtist.h           |   32 +
 tests/services/amazon/TestAmazonConfig.cpp         |   44 +
 tests/services/amazon/TestAmazonConfig.h           |   32 +
 tests/services/amazon/TestAmazonItem.cpp           |   57 +
 tests/services/amazon/TestAmazonItem.h             |   33 +
 tests/services/amazon/TestAmazonMetaFactory.cpp    |  129 +
 tests/services/amazon/TestAmazonMetaFactory.h      |   34 +
 tests/services/amazon/TestAmazonParser.cpp         |  141 +
 tests/services/amazon/TestAmazonParser.h           |   36 +
 tests/services/amazon/TestAmazonShoppingCart.cpp   |  155 +
 tests/services/amazon/TestAmazonShoppingCart.h     |   37 +
 .../services/amazon/TestAmazonShoppingCartItem.cpp |   60 +
 tests/services/amazon/TestAmazonShoppingCartItem.h |   34 +
 tests/services/amazon/TestAmazonTrack.cpp          |   69 +
 tests/services/amazon/TestAmazonTrack.h            |   33 +
 .../TestMasterSlaveSynchronizationJob.cpp          |    6 +-
 .../TestOneWaySynchronizationJob.cpp               |   18 +-
 tests/synchronization/TestUnionJob.cpp             |    6 +-
 utilities/afttagger/AFTTagger.cpp                  |    2 +-
 1036 files changed, 422343 insertions(+), 344914 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list