Added translation (not working at this moment, but there is some other fixes)