Wip/untranslate

This solves partially bug #72