Added not working i18n
Conflicts fix after merge