Add locales
Fix merge