Add locales
Merge branch 'minimum-input-length' into cbx4