use YSettings::localeDir() instead of LOCALEDIR (bnc #817588)
adapt changelog and version
Merge remote-tracking branch 'upstream/master'