Shorter strings
Missing translation
Merge pull request #2536 from Lineflyer/master

Shorter strings and missing translation