Add support to dialog l10n and fix highlighting