Merge Chinese translation changes into 1.7