[SCM] Amarok packaging branch, master, updated. debian/2.4.3-1-11-g0805c91

Modestas Vainius modax at alioth.debian.org
Sat Dec 17 18:55:35 UTC 2011


The following commit has been merged in the master branch:
commit 35319897e6d7997ae4ed2dc1bd5adf50ccb4e7fd
Merge: ab48526f2db2198b590bc3166158bc7ac3a9b569 b9a6f6da97041f837e4db20f373f5f864e1751d3
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Dec 17 11:55:31 2011 +0200

    Merge commit 'upstream/2.5.0'

 AUTHORS                                            |    6 +-
 CMakeLists.txt                                     |   21 +-
 ChangeLog                                          |  135 +
 README                                             |   11 +-
 cmake/modules/FindGooglemock.cmake                 |   16 +-
 cmake/modules/FindMySQLAmarok.cmake                |    3 +-
 doc/CMakeLists.txt                                 |   11 +-
 doc/de/index.docbook                               |   26 +-
 doc/en_US/Amarok-context.png                       |  Bin 27755 -> 0 bytes
 doc/en_US/Amarok-contextadd.png                    |  Bin 37050 -> 0 bytes
 doc/en_US/Amarok-removefromplaylist.png            |  Bin 82196 -> 0 bytes
 doc/en_US/Amarok-renameplaylist.png                |  Bin 13483 -> 0 bytes
 doc/en_US/Amarok2-4-1MergeIcon.png                 |  Bin 0 -> 719 bytes
 doc/en_US/Amarok2.1covermanager.png                |  Bin 125493 -> 0 bytes
 doc/en_US/Amarok2.1dynamicplaylist.png             |  Bin 10462 -> 0 bytes
 doc/en_US/Amarok2.1ipod.png                        |  Bin 7966 -> 0 bytes
 doc/en_US/Amarok2.1pleditor.png                    |  Bin 23731 -> 0 bytes
 doc/en_US/Amarok2.1rating.png                      |  Bin 16902 -> 0 bytes
 doc/en_US/Amarok2.1right.png                       |  Bin 18106 -> 0 bytes
 doc/en_US/Amarok2.1scriptmanager.png               |  Bin 28002 -> 0 bytes
 doc/en_US/Amarok2.4.1ConfigureDialogCollection.png |  Bin 27463 -> 0 bytes
 doc/en_US/Amarok2.4.1SavePlaylistChoices.png       |  Bin 5295 -> 0 bytes
 doc/en_US/Amarok2WrenchIcon.png                    |  Bin 0 -> 1312 bytes
 doc/en_US/AmarokNew2.4.png                         |  Bin 37228 -> 0 bytes
 doc/en_US/Amarok_-_internet_services.png           |  Bin 13464 -> 0 bytes
 doc/en_US/Amarok_addtoplaylist.png                 |  Bin 292057 -> 0 bytes
 doc/en_US/Amarok_addtoplaylist1.png                |  Bin 52097 -> 0 bytes
 doc/en_US/Amarokbreadcrumb.png                     |  Bin 4896 -> 0 bytes
 doc/en_US/Amarokcollection.png                     |  Bin 22583 -> 0 bytes
 doc/en_US/Amarokfull.png                           |  Bin 73473 -> 0 bytes
 doc/en_US/Amarokmediasources-files.png             |  Bin 7188 -> 0 bytes
 doc/en_US/Amarokmediasources-home.png              |  Bin 10441 -> 0 bytes
 doc/en_US/Amarokrightmenu.png                      |  Bin 6707 -> 0 bytes
 doc/en_US/Amarokripcd.png                          |  Bin 15936 -> 0 bytes
 doc/en_US/Amaroksystray.png                        |  Bin 4848 -> 0 bytes
 doc/en_US/Applications-internet.png                |  Bin 1680 -> 0 bytes
 doc/en_US/Cd_collection_sansa.png                  |  Bin 20292 -> 0 bytes
 doc/en_US/Configurecollection.png                  |  Bin 24862 -> 0 bytes
 doc/en_US/Context-applets-amarok.png               |  Bin 100577 -> 0 bytes
 doc/en_US/Controlamarok.png                        |  Bin 6577 -> 0 bytes
 doc/en_US/Document-save.png                        |  Bin 1802 -> 0 bytes
 doc/en_US/Edit-redo.png                            |  Bin 2125 -> 0 bytes
 doc/en_US/Edit-undo.png                            |  Bin 2128 -> 0 bytes
 doc/en_US/Face-smile.png                           |  Bin 0 -> 1307 bytes
 doc/en_US/Firstruncollection2.png                  |  Bin 9454 -> 0 bytes
 doc/en_US/Folder-amarok.png                        |  Bin 1474 -> 0 bytes
 doc/en_US/Hi32-action-collection-amarok.png        |  Bin 2386 -> 0 bytes
 doc/en_US/Hi48-action-clear-playlist-amarok.png    |  Bin 2118 -> 0 bytes
 doc/en_US/Hi48-action-edit-playlist-queue.png      |  Bin 857 -> 0 bytes
 ...ion-media-standard-track-progression-amarok.png |  Bin 2072 -> 0 bytes
 doc/en_US/Hi48-action-music-amarok.png             |  Bin 2027 -> 0 bytes
 doc/en_US/Hi48-action-podcast-amarok.png           |  Bin 2462 -> 0 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/Mediasources.png                         |  Bin 11499 -> 0 bytes
 doc/en_US/Preferences-other.png                    |  Bin 2478 -> 0 bytes
 doc/en_US/Pud-amarok.png                           |  Bin 110692 -> 0 bytes
 doc/en_US/View-list-tree.png                       |  Bin 1304 -> 0 bytes
 doc/en_US/View-media-playlist.png                  |  Bin 1671 -> 0 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                            | 8019 ++++++-
 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                               |   24 +-
 doc/es/quick.docbook                               |  148 -
 doc/es/requirements.docbook                        |  136 -
 doc/es/using.docbook                               | 2126 --
 doc/et/index.docbook                               |   14 +-
 doc/nl/index.docbook                               |14554 ++++++++++-
 doc/pt/index.docbook                               |14869 ++++++++++-
 doc/pt_BR/advanced.docbook                         | 1639 --
 doc/pt_BR/config.docbook                           |  555 -
 doc/pt_BR/faq.docbook                              | 1340 -
 doc/pt_BR/index.docbook                            |   56 +-
 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                               |   20 +-
 doc/sv/quick.docbook                               |  148 -
 doc/sv/requirements.docbook                        |  136 -
 doc/sv/using.docbook                               | 2154 --
 doc/uk/.directory                                  |    5 -
 doc/uk/Addingmusic.png                             |  Bin 86470 -> 0 bytes
 doc/uk/Amarok-context.png                          |  Bin 30544 -> 0 bytes
 doc/uk/Amarok-contextadd.png                       |  Bin 35717 -> 0 bytes
 doc/uk/Amarok2.1covermanager.png                   |  Bin 173790 -> 0 bytes
 doc/uk/Amarok2.1dynamicplaylist.png                |  Bin 14936 -> 0 bytes
 doc/uk/Amarok2.1ipod.png                           |  Bin 13298 -> 0 bytes
 doc/uk/Amarok2.1pleditor.png                       |  Bin 22420 -> 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/Amarok_-_context_view_configuration.png     |  Bin 34213 -> 0 bytes
 doc/uk/Amarok_-_internet_services.png              |  Bin 8975 -> 0 bytes
 doc/uk/Amarokbreadcrumb.png                        |  Bin 4988 -> 0 bytes
 doc/uk/Amarokcollection.png                        |  Bin 24025 -> 0 bytes
 doc/uk/Amarokfull.png                              |  Bin 84414 -> 0 bytes
 doc/uk/Amarokmediasources-home.png                 |  Bin 10423 -> 0 bytes
 doc/uk/Amarokrightmenu.png                         |  Bin 5117 -> 0 bytes
 doc/uk/Amarokripcd.png                             |  Bin 15554 -> 0 bytes
 doc/uk/Configurecollection.png                     |  Bin 25274 -> 0 bytes
 doc/uk/Context-applets-amarok.png                  |  Bin 26418 -> 0 bytes
 doc/uk/Firstruncollection2.png                     |  Bin 8704 -> 0 bytes
 doc/uk/Mediasources.png                            |  Bin 13549 -> 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                               |14807 ++++++++++-
 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
 po/CMakeLists.txt                                  |   83 +-
 po/af/CMakeLists.txt                               |    2 +
 po/af/amarok.po                                    |17956 ++++++++++++++
 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/CMakeLists.txt                               |    2 +
 po/bg/amarok.po                                    |17821 ++++++++++++++
 po/bg/amarok_scriptengine_qscript.po               |   90 +
 po/bg/amarokcollectionscanner_qt.po                |  203 +
 po/bg/amarokpkg.po                                 |  122 +
 po/bs/amarok.po                                    |16872 +++++++------
 po/bs/amarok_scriptengine_qscript.po               |    7 +-
 po/bs/amarokcollectionscanner_qt.po                |   42 +-
 po/bs/amarokpkg.po                                 |    8 +-
 po/ca/amarok.po                                    |25659 ++++++++++----------
 po/ca/amarok_scriptengine_qscript.po               |   10 +-
 po/ca/amarokcollectionscanner_qt.po                |   18 +-
 po/ca/amarokpkg.po                                 |    7 +-
 po/ca at valencia/amarok.po                           |25324 ++++++++++---------
 po/ca at valencia/amarok_scriptengine_qscript.po      |    4 +-
 po/ca at valencia/amarokcollectionscanner_qt.po       |   39 +-
 po/ca at valencia/amarokpkg.po                        |    7 +-
 po/cs/amarok.po                                    |17731 +++++++-------
 po/cs/amarok_scriptengine_qscript.po               |    3 +-
 po/cs/amarokcollectionscanner_qt.po                |   40 +-
 po/cs/amarokpkg.po                                 |    3 +-
 po/csb/CMakeLists.txt                              |    2 +
 po/csb/amarok.po                                   |18874 ++++++++++++++
 po/da/amarok.po                                    |24331 ++++++++++---------
 po/da/amarok_scriptengine_qscript.po               |    3 +-
 po/da/amarokcollectionscanner_qt.po                |   13 +-
 po/da/amarokpkg.po                                 |    3 +-
 po/de/amarok.po                                    |24836 ++++++++++---------
 po/de/amarok_scriptengine_qscript.po               |    3 +-
 po/de/amarokcollectionscanner_qt.po                |   14 +-
 po/de/amarokpkg.po                                 |    3 +-
 po/el/amarok.po                                    |16296 +++++++------
 po/el/amarok_scriptengine_qscript.po               |    3 +-
 po/el/amarokcollectionscanner_qt.po                |   11 +-
 po/el/amarokpkg.po                                 |    3 +-
 po/en_GB/amarok.po                                 |17990 +++++++-------
 po/en_GB/amarok_scriptengine_qscript.po            |    3 +-
 po/en_GB/amarokcollectionscanner_qt.po             |   38 +-
 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                                    |24721 ++++++++++---------
 po/es/amarok_scriptengine_qscript.po               |    3 +-
 po/es/amarokcollectionscanner_qt.po                |   13 +-
 po/es/amarokpkg.po                                 |    3 +-
 po/et/amarok.po                                    |24431 ++++++++++---------
 po/et/amarok_scriptengine_qscript.po               |    4 +-
 po/et/amarokcollectionscanner_qt.po                |   39 +-
 po/et/amarokpkg.po                                 |    4 +-
 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/amarok.po                                    |17895 +++++++-------
 po/fi/amarok_scriptengine_qscript.po               |    6 +-
 po/fi/amarokcollectionscanner_qt.po                |   41 +-
 po/fi/amarokpkg.po                                 |    6 +-
 po/fr/amarok.po                                    |26006 ++++++++++----------
 po/fr/amarok_scriptengine_qscript.po               |    3 +-
 po/fr/amarokcollectionscanner_qt.po                |    7 +-
 po/fr/amarokpkg.po                                 |    3 +-
 po/ga/amarok.po                                    |21376 +++++++++--------
 po/ga/amarok_scriptengine_qscript.po               |    3 +-
 po/ga/amarokcollectionscanner_qt.po                |    7 +-
 po/ga/amarokpkg.po                                 |    3 +-
 po/gl/amarok.po                                    |25484 ++++++++++----------
 po/gl/amarok_scriptengine_qscript.po               |    6 +-
 po/gl/amarokcollectionscanner_qt.po                |   41 +-
 po/gl/amarokpkg.po                                 |    6 +-
 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/CMakeLists.txt                               |    2 +
 po/hu/amarok.po                                    |17807 ++++++++++++++
 po/hu/amarok_scriptengine_qscript.po               |   91 +
 po/hu/amarokcollectionscanner_qt.po                |  143 +
 po/hu/amarokpkg.po                                 |  124 +
 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                                    |21605 +++++++++--------
 po/it/amarok_scriptengine_qscript.po               |    3 +-
 po/it/amarokcollectionscanner_qt.po                |   16 +-
 po/it/amarokpkg.po                                 |    3 +-
 po/ja/amarok.po                                    |24353 ++++++++++---------
 po/ja/amarok_scriptengine_qscript.po               |    4 +-
 po/ja/amarokcollectionscanner_qt.po                |    8 +-
 po/ja/amarokpkg.po                                 |    4 +-
 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                                    |24973 ++++++++++---------
 po/lt/amarok_scriptengine_qscript.po               |    9 +-
 po/lt/amarokcollectionscanner_qt.po                |   44 +-
 po/lt/amarokpkg.po                                 |    7 +-
 po/lv/CMakeLists.txt                               |    2 +
 po/lv/amarok.po                                    |17396 +++++++++++++
 po/lv/amarok_scriptengine_qscript.po               |   91 +
 po/lv/amarokcollectionscanner_qt.po                |   69 +
 po/lv/amarokpkg.po                                 |  124 +
 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                                    |18109 +++++++-------
 po/nb/amarok_scriptengine_qscript.po               |    2 +-
 po/nb/amarokcollectionscanner_qt.po                |   10 +-
 po/nb/amarokpkg.po                                 |    2 +-
 po/nds/CMakeLists.txt                              |    2 +
 po/nds/amarok.po                                   |22214 +++++++++++++++++
 po/nds/amarok_scriptengine_qscript.po              |   91 +
 po/nds/amarokcollectionscanner_qt.po               |   68 +
 po/nds/amarokpkg.po                                |  122 +
 po/ne/CMakeLists.txt                               |    2 +
 po/ne/amarok.po                                    |23610 ++++++++++++++++++
 po/nl/amarok.po                                    |24546 ++++++++++---------
 po/nl/amarok_scriptengine_qscript.po               |    3 +-
 po/nl/amarokcollectionscanner_qt.po                |   18 +-
 po/nl/amarokpkg.po                                 |    3 +-
 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                                    |23399 +++++++++---------
 po/pa/amarokcollectionscanner_qt.po                |    7 +-
 po/pa/amarokpkg.po                                 |    3 +-
 po/pl/amarok.po                                    |15509 ++++++------
 po/pl/amarok_scriptengine_qscript.po               |    3 +-
 po/pl/amarokcollectionscanner_qt.po                |   39 +-
 po/pl/amarokpkg.po                                 |    4 +-
 po/pt/amarok.po                                    |24657 ++++++++++---------
 po/pt/amarok_scriptengine_qscript.po               |    3 +-
 po/pt/amarokcollectionscanner_qt.po                |   18 +-
 po/pt/amarokpkg.po                                 |    3 +-
 po/pt_BR/amarok.po                                 |24723 ++++++++++---------
 po/pt_BR/amarok_scriptengine_qscript.po            |    3 +-
 po/pt_BR/amarokcollectionscanner_qt.po             |   16 +-
 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                                    |16808 +++++++------
 po/ru/amarok_scriptengine_qscript.po               |    8 +-
 po/ru/amarokcollectionscanner_qt.po                |   17 +-
 po/ru/amarokpkg.po                                 |    8 +-
 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/CMakeLists.txt                               |    2 +
 po/sk/amarok.po                                    |16578 +++++++++++++
 po/sk/amarok_scriptengine_qscript.po               |   89 +
 po/sk/amarokcollectionscanner_qt.po                |   65 +
 po/sk/amarokpkg.po                                 |  123 +
 po/sl/amarok.po                                    |25276 ++++++++++----------
 po/sl/amarok_scriptengine_qscript.po               |   50 +-
 po/sl/amarokcollectionscanner_qt.po                |    7 +-
 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                                    |25214 ++++++++++---------
 po/sr/amarok_scriptengine_qscript.po               |    2 +-
 po/sr/amarokcollectionscanner_qt.po                |   37 +-
 po/sr/amarokpkg.po                                 |    2 +-
 po/sr at ijekavian/amarok.po                          |25214 ++++++++++---------
 po/sr at ijekavian/amarok_scriptengine_qscript.po     |    2 +-
 po/sr at ijekavian/amarokcollectionscanner_qt.po      |   37 +-
 po/sr at ijekavian/amarokpkg.po                       |    2 +-
 po/sr at ijekavianlatin/amarok.po                     |25278 ++++++++++---------
 .../amarok_scriptengine_qscript.po                 |    2 +-
 po/sr at ijekavianlatin/amarokcollectionscanner_qt.po |   37 +-
 po/sr at ijekavianlatin/amarokpkg.po                  |    2 +-
 po/sr at latin/amarok.po                              |25214 ++++++++++---------
 po/sr at latin/amarok_scriptengine_qscript.po         |    2 +-
 po/sr at latin/amarokcollectionscanner_qt.po          |   37 +-
 po/sr at latin/amarokpkg.po                           |    2 +-
 po/sv/amarok.po                                    |24446 ++++++++++---------
 po/sv/amarok_scriptengine_qscript.po               |    3 +-
 po/sv/amarokcollectionscanner_qt.po                |   13 +-
 po/sv/amarokpkg.po                                 |    3 +-
 po/tg/CMakeLists.txt                               |    2 +
 po/tg/amarok.po                                    |15203 ++++++++++++
 po/th/CMakeLists.txt                               |    2 +
 po/th/amarok.po                                    |19990 +++++++++++++++
 po/th/amarokpkg.po                                 |  119 +
 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                                    |25006 ++++++++++---------
 po/uk/amarok_scriptengine_qscript.po               |    8 +-
 po/uk/amarokcollectionscanner_qt.po                |   20 +-
 po/uk/amarokpkg.po                                 |    8 +-
 po/wa/amarok.po                                    |17422 +++++++-------
 po/wa/amarokcollectionscanner_qt.po                |    7 +-
 po/zh_CN/amarok.po                                 |17818 +++++++-------
 po/zh_CN/amarok_scriptengine_qscript.po            |    3 +-
 po/zh_CN/amarokcollectionscanner_qt.po             |    7 +-
 po/zh_CN/amarokpkg.po                              |    3 +-
 po/zh_TW/amarok.po                                 |23602 +++++++++---------
 po/zh_TW/amarok_scriptengine_qscript.po            |    3 +-
 po/zh_TW/amarokcollectionscanner_qt.po             |   14 +-
 po/zh_TW/amarokpkg.po                              |    3 +-
 shared/TagsFromFileNameGuesser.cpp                 |   15 +-
 shared/TagsFromFileNameGuesser.h                   |    8 +-
 shared/Version.h                                   |    2 +-
 shared/tag_helpers/MP4TagHelper.cpp                |   14 +-
 shared/tag_helpers/StringHelper.cpp                |    4 +-
 src/App.cpp                                        |    5 +-
 src/CMakeLists.txt                                 |   32 +-
 src/EngineController.cpp                           |   56 +-
 src/EngineController.h                             |   12 +-
 src/ImageCache.h                                   |  120 -
 src/MainWindow.cpp                                 |   25 +-
 src/MainWindow.h                                   |    3 +-
 src/MediaDeviceCache.cpp                           |   38 +-
 src/PaletteHandler.cpp                             |   11 -
 src/PaletteHandler.h                               |   18 +-
 src/PluginManager.cpp                              |   11 +-
 src/QStringx.cpp                                   |  361 +
 src/QStringx.h                                     |  144 +-
 src/SvgHandler.cpp                                 |   20 +-
 src/SvgHandler.h                                   |    4 +-
 src/TrayIcon.cpp                                   |    5 +-
 src/amarok-play-audiocd.desktop                    |    2 +-
 src/amarok.desktop                                 |   11 +-
 src/amarok_addaspodcast.desktop                    |    2 +-
 src/amarok_append.desktop                          |    6 +-
 src/amarok_containers.desktop                      |   11 +-
 src/amarok_plugin.desktop                          |    2 +-
 src/amarokconfig.kcfg                              |    4 +
 src/amarokurls/NavigationUrlRunner.cpp             |    2 +-
 src/browsers/BrowserBreadcrumbWidget.cpp           |  119 +-
 src/browsers/BrowserBreadcrumbWidget.h             |   12 -
 src/browsers/BrowserCategory.cpp                   |    8 +
 src/browsers/BrowserCategory.h                     |    3 +
 src/browsers/BrowserCategoryList.cpp               |   36 +-
 src/browsers/BrowserCategoryList.h                 |   16 +-
 src/browsers/BrowserDock.cpp                       |   20 +-
 src/browsers/BrowserDock.h                         |    2 +-
 src/browsers/BrowserMessageArea.cpp                |    2 +
 src/browsers/CollectionTreeItemModelBase.cpp       |    5 +-
 src/browsers/CollectionTreeItemModelBase.h         |    1 +
 src/browsers/CollectionTreeView.cpp                |   76 +-
 src/browsers/CollectionTreeView.h                  |   12 +-
 src/browsers/SingleCollectionTreeItemModel.cpp     |    3 +
 .../CollectionTreeItemDelegate.cpp                 |   45 +-
 .../collectionbrowser/CollectionWidget.cpp         |   50 +-
 src/browsers/collectionbrowser/CollectionWidget.h  |    4 +-
 src/browsers/filebrowser/FileBrowser.cpp           |   33 +-
 src/browsers/filebrowser/FileBrowser.h             |    3 -
 src/browsers/filebrowser/FileBrowser_p.h           |    6 +-
 src/browsers/playlistbrowser/APGCategory.cpp       |   19 +-
 src/browsers/playlistbrowser/APGCategory.h         |    2 +-
 src/browsers/playlistbrowser/DynamicCategory.cpp   |    5 +-
 .../playlistbrowser/PlaylistBrowserCategory.cpp    |   17 +-
 .../playlistbrowser/PlaylistBrowserFilterProxy.cpp |    7 +
 .../playlistbrowser/PlaylistBrowserFilterProxy.h   |    1 +
 .../playlistbrowser/PlaylistBrowserModel.cpp       |  138 +-
 .../playlistbrowser/PlaylistBrowserModel.h         |    3 +
 .../playlistbrowser/PlaylistBrowserView.cpp        |   12 +-
 src/browsers/playlistbrowser/PlaylistBrowserView.h |    2 +
 .../playlistbrowser/PlaylistsByProviderProxy.cpp   |   38 +-
 .../playlistbrowser/PlaylistsByProviderProxy.h     |    5 +-
 src/browsers/playlistbrowser/PodcastCategory.cpp   |    5 +-
 src/browsers/playlistbrowser/PodcastModel.cpp      |   24 +-
 src/browsers/playlistbrowser/PodcastModel.h        |    6 +
 src/browsers/playlistbrowser/QtGroupingProxy.cpp   |  189 +-
 src/browsers/playlistbrowser/QtGroupingProxy.h     |    3 +-
 src/configdialog/dialogs/GeneralConfig.ui          |   22 +-
 src/context/Applet.cpp                             |   17 +-
 src/context/Applet.h                               |    5 -
 src/context/ContextDock.cpp                        |    3 +-
 src/context/ContextView.cpp                        |   93 +-
 src/context/ContextView.h                          |   13 +-
 src/context/CoverBling.cpp                         |  269 -
 src/context/CoverBling.h                           |   55 -
 src/context/ToolbarView.cpp                        |   76 +-
 src/context/ToolbarView.h                          |    3 -
 src/context/applets/CMakeLists.txt                 |    1 +
 src/context/applets/albums/Albums.cpp              |   21 +-
 src/context/applets/albums/Albums.h                |    1 -
 src/context/applets/albums/CMakeLists.txt          |    6 +-
 src/context/applets/currenttrack/CMakeLists.txt    |    6 +-
 src/context/applets/currenttrack/CurrentTrack.cpp  |   56 +-
 src/context/applets/currenttrack/CurrentTrack.h    |    6 +-
 .../applets/currenttrack/currentTrackSettings.ui   |    9 +-
 src/context/applets/info/CMakeLists.txt            |    3 +-
 .../info/amarok-context-applet-info.desktop        |    1 +
 src/context/applets/labels/CMakeLists.txt          |    6 +-
 src/context/applets/labels/LabelGraphicsItem.cpp   |   26 +-
 src/context/applets/labels/LabelsApplet.cpp        |   43 +-
 .../labels/amarok-context-applet-labels.desktop    |    1 +
 src/context/applets/lyrics/CMakeLists.txt          |    6 +-
 src/context/applets/lyrics/LyricsApplet.cpp        |    5 +-
 src/context/applets/photos/CMakeLists.txt          |    6 +-
 .../photos/amarok-context-applet-photos.desktop    |    1 +
 src/context/applets/playlistinfo/CMakeLists.txt    |    6 +-
 .../amarok-context-applet-playlistinfo.desktop     |    2 +-
 .../applets/similarartists/ArtistWidget.cpp        |    2 +-
 src/context/applets/similarartists/CMakeLists.txt  |    9 +-
 .../amarok-context-applet-similarArtists.desktop   |    1 +
 .../amarok-context-applet-songkick.desktop         |    1 +
 .../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            |    7 +-
 .../tabs/amarok-context-applet-tabs.desktop        |    3 +-
 src/context/applets/upcomingevents/CMakeLists.txt  |    4 +-
 .../applets/upcomingevents/UpcomingEventsStack.cpp |    1 +
 .../amarok-context-applet-upcomingEvents.desktop   |    1 +
 src/context/applets/videoclip/CMakeLists.txt       |    8 +-
 .../amarok-context-applet-videoclip.desktop        |    3 +-
 src/context/applets/wikipedia/CMakeLists.txt       |    5 +-
 src/context/applets/wikipedia/WikipediaApplet.cpp  |   44 +-
 src/context/applets/wikipedia/WikipediaApplet_p.h  |    5 +-
 .../containments/verticallayout/CMakeLists.txt     |    6 +-
 .../verticallayout/VerticalToolbarContainment.cpp  |   13 +-
 .../amarok-containment-vertical.desktop            |    6 +-
 src/context/engines/CMakeLists.txt                 |    1 +
 src/context/engines/current/CurrentEngine.cpp      |   38 +-
 src/context/engines/current/CurrentEngine.h        |    1 +
 .../current/amarok-data-engine-current.desktop     |    2 +-
 .../engines/info/amarok-data-engine-info.desktop   |    1 +
 .../labels/amarok-data-engine-labels.desktop       |    1 +
 .../lyrics/amarok-data-engine-lyrics.desktop       |    2 +-
 .../photos/amarok-data-engine-photos.desktop       |    1 +
 .../amarok-data-engine-similarArtists.desktop      |    1 +
 .../songkick/amarok-data-engine-songkick.desktop   |    2 +-
 .../engines/spectrumanalyzer/CMakeLists.txt        |   12 +
 .../spectrumanalyzer/SpectrumAnalyzerEngine.cpp    |  183 +
 .../spectrumanalyzer/SpectrumAnalyzerEngine.h      |   95 +
 .../amarok-data-engine-spectrum-analyzer.desktop   |   27 +
 src/context/engines/tabs/TabsEngine.cpp            |  121 -
 src/context/engines/tabs/TabsEngine.h              |   11 -
 .../engines/tabs/amarok-data-engine-tabs.desktop   |    3 +-
 .../amarok-data-engine-upcomingEvents.desktop      |    1 +
 .../videoclip/amarok-data-engine-videoclip.desktop |    1 +
 src/context/engines/wikipedia/WikipediaEngine.cpp  |   11 +-
 .../wikipedia/amarok-data-engine-wikipedia.desktop |    2 +-
 ...k-scriptengine-applet-simple-javascript.desktop |    3 +
 .../amarok-scriptengine-runner-javascript.desktop  |    1 +
 .../scriptengine/javascript/bind_dataengine.h      |    3 -
 src/context/servicetypes/amarok_animator.desktop   |    2 +-
 .../servicetypes/amarok_context_applet.desktop     |    2 +-
 .../servicetypes/amarok_data_engine.desktop        |    4 +-
 src/context/toolbar/AppletItemOverlay.cpp          |   25 +-
 src/context/toolbar/AppletToolbar.cpp              |   58 +-
 src/context/toolbar/AppletToolbar.h                |    3 -
 src/context/toolbar/AppletToolbarBase.cpp          |    2 +-
 src/context/widgets/ContainmentArrow.h             |    2 +-
 src/context/widgets/RecentlyPlayedListWidget.cpp   |  160 +-
 src/context/widgets/RecentlyPlayedListWidget.h     |   10 +-
 src/core-impl/collections/audiocd/AudioCdMeta.cpp  |    8 +-
 src/core-impl/collections/audiocd/CMakeLists.txt   |   69 +-
 .../amarok_collection-audiocdcollection.desktop    |    4 +-
 src/core-impl/collections/daap/CMakeLists.txt      |    3 +-
 src/core-impl/collections/daap/DaapMeta.cpp        |    6 +
 .../daap/amarok_collection-daapcollection.desktop  |    6 +-
 src/core-impl/collections/db/DatabaseCollection.h  |    3 +
 src/core-impl/collections/db/ScanManager.cpp       |   12 +-
 src/core-impl/collections/db/ScanManager.h         |    4 +-
 .../collections/db/ScanResultProcessor.cpp         |   12 +-
 src/core-impl/collections/db/ScanResultProcessor.h |    2 +-
 src/core-impl/collections/db/sql/CMakeLists.txt    |    7 -
 src/core-impl/collections/db/sql/SqlCollection.cpp |   19 +
 src/core-impl/collections/db/sql/SqlCollection.h   |    2 +
 src/core-impl/collections/db/sql/SqlQueryMaker.cpp |   11 +-
 .../collections/db/sql/SqlReadLabelCapability.cpp  |    2 +-
 .../collections/db/sql/SqlReadLabelCapability.h    |    2 +-
 src/core-impl/collections/db/sql/SqlRegistry.cpp   |    3 +-
 .../collections/db/sql/SqlWriteLabelCapability.cpp |    2 +-
 .../collections/db/sql/SqlWriteLabelCapability.h   |    2 +-
 .../db/sql/device/massstorage/CMakeLists.txt       |    2 -
 .../massstorage/amarok_device_massstorage.desktop  |   10 +-
 .../collections/db/sql/device/nfs/CMakeLists.txt   |    2 -
 .../db/sql/device/nfs/amarok_device_nfs.desktop    |    6 +-
 .../collections/db/sql/device/smb/CMakeLists.txt   |    2 -
 .../db/sql/device/smb/amarok_device_smb.desktop    |    6 +-
 .../db/sql/mysqlecollection/CMakeLists.txt         |    1 +
 .../db/sql/mysqlecollection/MySqlEmbeddedStorage.h |    1 +
 .../amarok_collection-mysqlecollection.desktop     |    7 +-
 .../db/sql/mysqlservercollection/CMakeLists.txt    |    1 +
 ...amarok_collection-mysqlservercollection.desktop |    7 +-
 .../collections/ipodcollection/CMakeLists.txt      |    5 +-
 .../amarok_collection-ipodcollection.desktop       |   10 +-
 .../ipodcollection/handler/IpodHandler.cpp         |  134 +-
 .../ipodcollection/handler/IpodHandler.h           |   32 +-
 .../handler/capabilities/IpodArtworkCapability.cpp |    2 +-
 .../capabilities/IpodPlaylistCapability.cpp        |    2 +-
 .../handler/capabilities/IpodReadCapability.cpp    |    8 +-
 .../handler/capabilities/IpodReadCapability.h      |    3 +-
 .../handler/capabilities/IpodWriteCapability.cpp   |    8 +-
 .../handler/capabilities/IpodWriteCapability.h     |    1 +
 .../support/IpodConnectionAssistant.cpp            |  117 +-
 .../MediaDeviceCollection.cpp                      |   18 +-
 .../mediadevicecollection/MediaDeviceCollection.h  |    5 -
 .../mediadevicecollection/MediaDeviceMeta.cpp      |  117 +-
 .../mediadevicecollection/MediaDeviceMeta.h        |    8 +-
 ...amarok_collection-mediadevicecollection.desktop |    6 +-
 .../handler/MediaDeviceHandler.cpp                 |   55 +-
 .../handler/MediaDeviceHandlerCapability.cpp       |   22 +-
 .../handler/MediaDeviceHandlerCapability.h         |   30 +-
 .../handler/capabilities/ArtworkCapability.h       |    1 +
 .../handler/capabilities/PlaylistCapability.h      |    3 +-
 .../handler/capabilities/ReadCapability.cpp        |    9 +
 .../handler/capabilities/ReadCapability.h          |    4 +-
 .../handler/capabilities/ReadCapabilityBase.h      |    1 +
 .../handler/capabilities/WriteCapability.cpp       |    8 +
 .../handler/capabilities/WriteCapability.h         |    2 +
 .../handler/capabilities/WriteCapabilityBase.h     |    1 +
 .../playlist/MediaDeviceUserPlaylistProvider.h     |    6 +-
 .../collections/mtpcollection/CMakeLists.txt       |   59 +-
 .../amarok_collection-mtpcollection.desktop        |    6 +-
 .../handler/capabilities/MtpPlaylistCapability.cpp |    2 +-
 .../handler/capabilities/MtpReadCapability.cpp     |    2 +-
 .../handler/capabilities/MtpWriteCapability.cpp    |    2 +-
 .../amarok_collection-nepomukcollection.desktop    |    2 +-
 .../collections/playdarcollection/CMakeLists.txt   |    2 +-
 .../amarok_collection-playdarcollection.desktop    |    5 +-
 .../support/CollectionLocationDelegateImpl.cpp     |    8 +-
 .../collections/support/CollectionManager.cpp      |    7 +-
 .../collections/support/CollectionManager.h        |    3 +
 src/core-impl/collections/support/Expression.cpp   |    9 +-
 src/core-impl/collections/support/Expression.h     |    2 +-
 src/core-impl/collections/support/MemoryMeta.h     |  301 +
 .../collections/support/MemoryQueryMaker.cpp       |    1 -
 .../collections/support/MemoryQueryMakerInternal.h |    1 +
 .../collections/support/TextualQueryFilter.cpp     |  230 +-
 .../collections/umscollection/CMakeLists.txt       |   20 +-
 .../collections/umscollection/UmsCollection.cpp    |  607 +-
 .../collections/umscollection/UmsCollection.h      |  131 +-
 .../umscollection/UmsCollectionLocation.cpp        |  224 +
 .../umscollection/UmsCollectionLocation.h          |   89 +
 .../collections/umscollection/UmsConfiguration.ui  |  291 +-
 .../amarok_collection-umscollection.desktop        |    4 +-
 .../umscollection/handler/UmsHandler.cpp           | 1151 -
 .../collections/umscollection/handler/UmsHandler.h |  303 -
 .../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     |  112 -
 .../handler/capabilities/UmsReadCapability.h       |   64 -
 .../handler/capabilities/UmsWriteCapability.cpp    |   82 -
 .../handler/capabilities/UmsWriteCapability.h      |   58 -
 .../umscollection/podcasts/UmsPodcastMeta.cpp      |    3 +
 .../umscollection/podcasts/UmsPodcastProvider.cpp  |   25 +-
 .../umscollection/podcasts/UmsPodcastProvider.h    |    5 +-
 .../support/UmsConnectionAssistant.cpp             |   94 -
 .../umscollection/support/UmsConnectionAssistant.h |   37 -
 .../umscollection/support/UmsDeviceInfo.cpp        |   37 -
 .../umscollection/support/UmsDeviceInfo.h          |   35 -
 .../collections/upnpcollection/CMakeLists.txt      |    3 +-
 .../collections/upnpcollection/UpnpMeta.cpp        |    4 +
 .../upnpcollection/UpnpSearchCollection.cpp        |    2 +
 .../amarok_collection-upnpcollection.desktop       |    6 +-
 src/core-impl/meta/file/File.cpp                   |    8 +-
 src/core-impl/meta/file/File_p.h                   |    5 +-
 src/core-impl/meta/stream/Stream.cpp               |    6 +-
 .../playlists/types/file/m3u/M3UPlaylist.cpp       |    3 +
 .../playlists/types/file/xspf/XSPFPlaylist.cpp     |   30 +-
 .../sql/PodcastFilenameLayoutConfigDialog.cpp      |   35 +-
 .../sql/PodcastFilenameLayoutConfigDialog.h        |   21 +-
 .../sql/PodcastFilenameLayoutConfigWidget.ui       |    1 +
 src/core-impl/podcasts/sql/SqlPodcastMeta.cpp      |   91 +-
 src/core-impl/podcasts/sql/SqlPodcastMeta.h        |   11 +-
 src/core-impl/podcasts/sql/SqlPodcastProvider.cpp  |    4 +
 src/core/collections/Collection.h                  |    4 +-
 src/core/collections/MetaQueryMaker.cpp            |    6 +
 src/core/collections/QueryMaker.h                  |    1 +
 src/core/meta/Meta.h                               |   15 +
 src/core/meta/support/MetaConstants.cpp            |  136 +-
 src/core/meta/support/MetaUtility.cpp              |    2 +-
 src/core/playlists/Playlist.h                      |    7 +
 src/core/podcasts/PodcastMeta.cpp                  |   14 +
 src/core/podcasts/PodcastMeta.h                    |    3 +-
 src/core/podcasts/PodcastProvider.cpp              |    3 -
 src/core/support/Amarok.cpp                        |   70 +
 src/core/support/Amarok.h                          |    8 +
 src/core/support/Components.cpp                    |    2 +-
 src/covermanager/CoverFetchingActions.cpp          |    6 +
 src/covermanager/CoverFoundDialog.cpp              |   15 +-
 src/data/amarok.notifyrc                           |    3 +
 src/dbus/DBusQueryHelper.cpp                       |    2 +-
 src/dbus/mpris1/PlayerHandler.cpp                  |    1 -
 src/dbus/mpris2/Mpris2DBusHandler.cpp              |   80 +-
 src/dbus/mpris2/Mpris2DBusHandler.h                |    1 +
 src/dialogs/EditFilterDialog.cpp                   |   29 +-
 src/dialogs/EditFilterDialog.h                     |    2 +-
 src/dialogs/FilenameLayoutDialog.cpp               |  574 +-
 src/dialogs/FilenameLayoutDialog.h                 |   39 +-
 src/dialogs/FilenameLayoutDialog.ui                |  321 +-
 src/dialogs/OrganizeCollectionDialog.cpp           |  139 +-
 src/dialogs/OrganizeCollectionDialog.h             |    8 -
 src/dialogs/OrganizeCollectionDialogBase.ui        |  249 +-
 src/dialogs/TagDialog.cpp                          |   56 +-
 src/dialogs/TagDialogBase.ui                       |   59 +-
 src/dialogs/TagGuesser.cpp                         |    3 +-
 src/dialogs/TrackOrganizer.cpp                     |   28 +-
 src/dialogs/TrackOrganizer.h                       |    2 +-
 src/dynamic/BiasFactory.cpp                        |    1 +
 src/dynamic/DynamicModel.cpp                       |    5 +-
 src/dynamic/DynamicPlaylist.h                      |    1 +
 src/dynamic/biases/AlbumPlayBias.cpp               |    2 +-
 src/dynamic/biases/TagMatchBias.cpp                |  189 +-
 src/images/CMakeLists.txt                          |    3 +-
 src/images/emblem-amazon-scalable.svgz             |  Bin 0 -> 1647 bytes
 src/images/emblem-amazon.png                       |  Bin 0 -> 630 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-view-services-amazon-amarok.png    |  Bin 0 -> 523 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
 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
 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
 .../hi48-action-view-services-amazon-amarok.png    |  Bin 0 -> 1474 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
 src/main.cpp                                       |   92 +-
 src/moodbar/MoodbarManager.cpp                     |   25 +-
 src/moodbar/MoodbarManager.h                       |   12 +-
 src/musicbrainz/MusicBrainzFinder.cpp              |   31 -
 src/musicbrainz/MusicBrainzFinder.h                |    1 -
 src/musicbrainz/MusicBrainzXmlParser.cpp           |   12 +-
 src/musicbrainz/MusicBrainzXmlParser.h             |    2 +-
 src/musicbrainz/MusicDNSAudioDecoder.cpp           |   37 +-
 src/playlist/PlaylistDock.cpp                      |   40 +-
 src/playlist/PlaylistDock.h                        |    2 +-
 src/playlist/PlaylistModel.cpp                     |   97 +-
 src/playlist/PlaylistModel.h                       |    7 +-
 src/playlist/PlaylistToolBar.cpp                   |    3 +-
 src/playlist/navigators/StandardTrackNavigator.cpp |   35 +-
 src/playlist/navigators/TrackNavigator.cpp         |    4 +-
 src/playlist/proxymodels/GroupingProxy.cpp         |    8 +-
 src/playlist/view/PlaylistViewCommon.cpp           |  111 +-
 src/playlist/view/listview/PrettyItemDelegate.cpp  |   75 +-
 src/playlist/view/listview/PrettyItemDelegate.h    |    3 +
 src/playlistgenerator/Constraint.cpp               |    4 +-
 src/playlistgenerator/Constraint.h                 |    2 +-
 src/playlistgenerator/ConstraintGroup.cpp          |  289 +-
 src/playlistgenerator/ConstraintGroup.h            |   32 +-
 src/playlistgenerator/ConstraintNode.cpp           |   12 +-
 src/playlistgenerator/ConstraintNode.h             |   29 +-
 src/playlistgenerator/ConstraintSolver.cpp         |  415 +-
 src/playlistgenerator/ConstraintSolver.h           |   57 +-
 src/playlistgenerator/ConstraintTestWrapper.cpp    |   55 -
 src/playlistgenerator/ConstraintTestWrapper.h      |   44 -
 src/playlistgenerator/ConstraintTester.cpp         |  335 -
 src/playlistgenerator/ConstraintTester.h           |   85 -
 src/playlistgenerator/Preset.cpp                   |   12 +-
 src/playlistgenerator/Preset.h                     |    1 -
 src/playlistgenerator/TODO                         |    6 +-
 src/playlistgenerator/constraints/Checkpoint.cpp   |  316 +-
 src/playlistgenerator/constraints/Checkpoint.h     |   86 +-
 .../constraints/CheckpointSupport.cpp              |  321 -
 src/playlistgenerator/constraints/Matching.cpp     |    2 +-
 src/playlistgenerator/constraints/Matching.h       |   10 +-
 .../constraints/PlaylistDuration.cpp               |  154 +-
 .../constraints/PlaylistDuration.h                 |   25 +-
 .../constraints/PlaylistLength.cpp                 |   96 +-
 src/playlistgenerator/constraints/PlaylistLength.h |   26 +-
 .../constraints/PreventDuplicates.cpp              |  396 +-
 .../constraints/PreventDuplicates.h                |   96 +-
 src/playlistgenerator/constraints/TagMatch.cpp     |  107 +-
 src/playlistgenerator/constraints/TagMatch.h       |   17 +-
 .../constraints/TagMatchComparer.cpp               |    2 +-
 .../constraints/TagMatchSupport.cpp                |    2 +-
 .../constraints/TrackSpreader.cpp                  |  314 +-
 src/playlistgenerator/constraints/TrackSpreader.h  |   68 +-
 src/playlistmanager/PlaylistManager.cpp            |  162 +-
 src/playlistmanager/PlaylistManager.h              |   25 +-
 src/playlistmanager/SyncRelationStorage.cpp        |   21 +
 src/playlistmanager/SyncRelationStorage.h          |   12 +-
 src/playlistmanager/SyncedPlaylist.cpp             |  177 +-
 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  |   86 +-
 src/playlistmanager/file/PlaylistFileProvider.h    |    4 +-
 src/playlistmanager/sql/SqlPlaylist.cpp            |    5 +-
 src/scanner/GenericScanManager.cpp                 |  330 +
 src/scanner/GenericScanManager.h                   |  183 +
 src/scriptengine/AmarokNetworkScript.cpp           |    4 +-
 src/scriptengine/AmarokScriptableServiceScript.cpp |    2 +-
 src/scripts/librivox_service/main.js               |    2 +-
 src/services/CMakeLists.txt                        |    1 +
 src/services/InfoParserBase.cpp                    |    2 +-
 src/services/InfoParserBase.h                      |    2 +-
 src/services/ServiceAlbumCoverDownloader.cpp       |   67 +-
 src/services/ServiceAlbumCoverDownloader.h         |    6 +-
 src/services/ServiceBase.cpp                       |    6 +-
 src/services/ServiceCollection.h                   |    6 +-
 src/services/ServiceMetaBase.cpp                   |    3 -
 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/AmpacheAccountLogin.h         |    4 +
 src/services/ampache/AmpacheMeta.cpp               |    9 +
 src/services/ampache/AmpacheMeta.h                 |    1 +
 src/services/ampache/CMakeLists.txt                |    2 +-
 .../ampache/amarok_service_ampache.desktop         |    4 +-
 .../ampache/amarok_service_ampache_config.desktop  |    7 +-
 src/services/gpodder/CMakeLists.txt                |   34 +-
 src/services/gpodder/GpodderConfigWidget.ui        |  122 +
 src/services/gpodder/GpodderPodcastMeta.cpp        |   64 +
 src/services/gpodder/GpodderPodcastMeta.h          |   61 +
 .../gpodder/GpodderPodcastRequestHandler.h         |    1 -
 src/services/gpodder/GpodderPodcastTreeItem.cpp    |    2 -
 src/services/gpodder/GpodderPodcastTreeItem.h      |    1 -
 src/services/gpodder/GpodderProvider.cpp           | 1079 +
 src/services/gpodder/GpodderProvider.h             |  170 +
 src/services/gpodder/GpodderService.cpp            |  131 +-
 src/services/gpodder/GpodderService.h              |   34 +-
 src/services/gpodder/GpodderServiceConfig.cpp      |  191 +
 src/services/gpodder/GpodderServiceConfig.h        |   70 +
 src/services/gpodder/GpodderServiceModel.cpp       |  226 +-
 src/services/gpodder/GpodderServiceModel.h         |   31 +-
 src/services/gpodder/GpodderServiceSettings.cpp    |  236 +
 src/services/gpodder/GpodderServiceSettings.h      |   70 +
 .../gpodder/GpodderSortFilterProxyModel.cpp        |    2 -
 src/services/gpodder/GpodderTagTreeItem.cpp        |    3 +-
 src/services/gpodder/GpodderTagTreeItem.h          |    2 -
 src/services/gpodder/GpodderTreeItem.cpp           |   42 +-
 src/services/gpodder/GpodderTreeItem.h             |    9 +-
 .../gpodder/amarok_service_gpodder.desktop         |   15 +-
 .../gpodder/amarok_service_gpodder_config.desktop  |   44 +
 src/services/jamendo/CMakeLists.txt                |    1 -
 src/services/jamendo/JamendoService.cpp            |    2 +-
 .../jamendo/amarok_service_jamendo.desktop         |    4 +-
 src/services/lastfm/LastFmServiceConfig.cpp        |   19 +-
 src/services/lastfm/LastFmServiceConfig.h          |    7 +
 src/services/lastfm/LastFmTreeModel.cpp            |  113 +-
 src/services/lastfm/LastFmTreeModel.h              |   15 +-
 src/services/lastfm/ScrobblerAdapter.cpp           |   52 +-
 src/services/lastfm/ScrobblerAdapter.h             |    3 +-
 src/services/lastfm/amarok_service_lastfm.desktop  |    5 +-
 .../lastfm/amarok_service_lastfm_config.desktop    |    4 +-
 src/services/lastfm/meta/LastFmMeta.cpp            |    5 +-
 .../lastfm/meta/MultiPlayableCapabilityImpl_p.h    |    6 +-
 src/services/magnatune/CMakeLists.txt              |    2 -
 src/services/magnatune/MagnatuneInfoParser.cpp     |    2 +-
 src/services/magnatune/MagnatuneSettingsModule.cpp |    4 +-
 .../amarok_service_magnatunestore.desktop          |    7 +-
 .../amarok_service_magnatunestore_config.desktop   |    6 +-
 src/services/mp3tunes/CMakeLists.txt               |    1 -
 .../mp3tunes/amarok_service_mp3tunes.desktop       |    4 +-
 .../amarok_service_mp3tunes_config.desktop         |    3 +-
 src/services/opmldirectory/CMakeLists.txt          |    1 -
 .../amarok_service_opmldirectory.desktop           |    6 +-
 src/toolbar/MainToolbar.cpp                        |    1 +
 src/toolbar/MainToolbar.h                          |   15 +-
 src/widgets/ClearSpinBox.cpp                       |   42 +
 src/widgets/ClearSpinBox.h                         |   35 +
 src/widgets/MetaQueryWidget.cpp                    |   49 +-
 src/widgets/MetaQueryWidget.h                      |    4 +-
 src/widgets/PrettyTreeView.cpp                     |    1 +
 src/widgets/SearchWidget.cpp                       |  198 +-
 src/widgets/SearchWidget.h                         |   71 +-
 tests/CMakeLists.txt                               |    2 +
 tests/TestQStringx.cpp                             |    9 +-
 utilities/collectionscanner/Album.h                |    8 +-
 utilities/collectionscanner/BatchFile.h            |    7 +-
 utilities/collectionscanner/CMakeLists.txt         |    1 -
 utilities/collectionscanner/CollectionScanner.cpp  |    2 +-
 utilities/collectionscanner/CollectionScanner.h    |    8 +-
 utilities/collectionscanner/Directory.h            |    8 +-
 utilities/collectionscanner/Playlist.cpp           |    2 +-
 utilities/collectionscanner/Playlist.h             |    8 +-
 utilities/collectionscanner/Track.h                |    7 +-
 1366 files changed, 1062004 insertions(+), 404130 deletions(-)

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list