564: make translation more faithful to the org.