Feature/i18n

Translation is done but not working - Everything seems ok - Got to dig into the code to see what's wrong...