Edit locales
Merge branch 'release/1.8.2.7'

* release/1.8.2.7:
  Edit locales