Updated locales; re-arranged strings