Improve i18n translatability (is that a word, if not, now it is)