Merge pull request #117 from robotmay/locales

Latest locale updates
Merge remote-tracking branch 'upstream/master' into locales