Merged kxy's translation changes.