change i18n conflict (closes #3036)
Merge pull request #21 from Eric-Brison/2.0-I3036

change i18n conflict