Update composer.json
Update translations
Use annotations for validation
Merge with master
Merge pull request #224 from Kunstmaan/fix_translations

Fix translations