Fixing translation issues (refs: #558)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev