BLD-699: Fix i18n.
Mark error messages.
Address comments.