Improve support for transalation