Fixed api2 bug, and modified translation