Update method to show error
Merge branch 'development'
Update language strings