Merge branch 'Applications/15.12'

diff --cc src/dolphinpart.desktop
Simple merge

diff --cc src/org.kde.dolphin.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinnavigation.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinservices.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinviewmodes.desktop
Simple merge

diff --cc src/views/versioncontrol/fileviewversioncontrolplugin.desktop
Simple merge