improve internationalize
Merge branch 'lin_branch'