gettext and markup fixes