Task/localization

@ideastouch 
@hernangonzalez