Fix #Bug18 translation enhancement