Trim trailing whitespace and add missing i18n message