i18n of static text
Merge branch 'upstream-master' into pullrequests/i18n
use gettext alias _
add local and timezone information to user model
translation
CR review
Merge pull request #7 from wangsha/pullrequests/i18n

Pullrequests/i18n