Wrap most translatable strings with tr().
Merge remote branch 'upstream/workshop'
Merge pull request #104 from olear/master

Wrap strings with tr()