Merge pull request #4462 from jamtur01/langfix

Updated a variety of language and error messages