EAP6-18: Refactoring of the confirm step; apply success i18n
EAP6-18: i18n for apply conflict