merged the locales update to minimize sql files and order