Update and translate strings
Merge pull request #801 from Zahnstocher/strings2-patch

Update and translate strings