Fix missing i18n msgs for edit conflicts

They got lost in https://gerrit.wikimedia.org/r/#/c/98836/'s last rebase

Change-Id: Ia33d9110381b74be5cdf76306e9d44fa26a0b8a3
Merge "Fix missing i18n msgs for edit conflicts"