Add more string conversions to i18n locale
Fix specs