Minor style and translation corrections

I've separated the changes into multiple commits so that it is easier to read the changes