fixed language to modal
Merge branch 'master' into authenticate