Merge "Add basic translation support"