Update messages in preparation for i18n