Improving a couple of strings and typos fixing.
approved this merge request
mentioned in commit 9148605d
merged