add translation and fix bug