Improve revert/cherry-pick error messages

What does this MR do and why?

This MR improves revert/cherry-pick error messages when there is a conflict. It also uses i18n strings. Related to #389084 (closed)

Screenshots or screen recordings

Merge Request example

Commit example

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.

Related to #389084 (closed)