Merges translation change from cmann