Import recent changes from official translator