[kde-doc-english] [amarok] /: Merge branch 'gsoc-importers'

[Konrad Zemek]

Git commit d77864e758a2162d88aafd432a7eb1e813907f8f by Konrad Zemek.
Committed on 09/02/2014 at 18:15.
Pushed by kzemek into branch 'master'.

Merge branch 'gsoc-importers'

This commit merges my work on advanced statistic importers built on
StatSyncing framework. More user-oriented details can be found on my
blog: http://konradzemek.com/category/gsoc/

The commit also includes changes to the ChangeLog file.

FEATURES:
 * Statistics synchronization between Amarok collections and
  Amarok 1.4, Amarok 2.x, Apple iTunes, Banshee, Clementine, and
  Rhythmbox track databases.

CHANGES:
 * "Import" button under Configure Amarok -> Local Collection no longer
   serves to import statistics from Amarok 1.4 and iTunes, and has been
   renamed to "Import batch file" to reflect the change.
 * Configure Amarok -> Metadata tab includes new buttons to add and
   reconfigure synchronization targets.

REVIEW: 113272
REVIEW: 113275
REVIEW: 113277
REVIEW: 113278
GUI: Added StatSyncing provider creation and modification dialogs. Old
     importers' dialog changed to only support batch file importing.
     New buttons added to the Metadata configuration tab.
DIGEST: Amarok advanced track statistics importers GSoC project merged.
     Please see http://konradzemek.com/category/gsoc/ for more info and
     screenshots.

M  +8    -0    ChangeLog

http://commits.kde.org/amarok/d77864e758a2162d88aafd432a7eb1e813907f8f

diff --cc ChangeLog
index 0eb03c8,0eb03c8..e4e67a8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,10 -5,10 +5,18 @@@ Amarok ChangeLo
  
  VERSION 2.9-Beta 1
    FEATURES:
++   * Statistics synchronization between Amarok collections and
++     Amarok 1.4, Amarok 2.x, Apple iTunes, Banshee, Clementine, and
++     Rhythmbox track databases.
     * Usability of the Organize Files dialog has been improved.
     * Wikipedia can now be also used over SSL.
  
    CHANGES:
++   * "Import" button under Configure Amarok -> Local Collection no longer
++     serves to import statistics from Amarok 1.4 and iTunes, and has been
++     renamed to "Import batch file" to reflect the change.
++   * Configure Amarok -> Metadata tab includes new buttons to add and
++     reconfigure synchronization targets.
     * When ffmpeg is not available, the Transcode dialog is no longer skipped; info message
       is shown instead. Patch by Jai Luthra. (BR 317902)
     * Amarok now uses some C++11 features. The subset used is defined by the