修改西文語系
Merge branch 'master2' into newtinymce