Update translations
Fix possible bug
Bugfix #294
Merge branch 'master' into postgresql