EAP6-18: i18n for apply conflict