Merge pull request #149 from gioman/master

calendar update and related translations