Locales refactor
Merge branch 'master' into locales
Remove duplicated keys
Merge branch 'master' into locales
Improve locales