Add missing error
Add missing translations
Merge