Merge "Fix some i18n messaging"