Chinese screen

Merged Biyi Wen requested to merge patch-3 into master