Updated localization
Merge branch 'master' into 1-2-stable