use xi18n when markup
Fix -Woverloaded-virtual issues

REVIEW: 119334