Translations:Help:Paragraph-based Edit Conflict Interface/15/qqq

I changed the translation for "...both the conflicting text and your text is shown,..." as "...both the conflicting text and your text you will edit is shown,..."