Update CALCULATED_IN and SEVER_TIME from lang
Merge pull request #177 from pickuse/patch-3

Update CALCULATED_IN and SEVER_TIME from lang