Changes #283
Update translations
Merge branch 'master' into postgresql