fix units are shown as seconds for mixed plans; fixes #45
Merge remote-tracking branch 'origin/master' into translation
update translation stats