User i18n
Merge branch 'master' of https://github.com/demaW/TimeAssistant