Merge branch 'tl/zh_CN_2.42.0_rnd1' of github.com:dyrone/git