Merge pull request #2 from pderksen/master

Update from original (2.1.3)
Translating 2 omitted strings
Merge pull request #3 from pderksen/master

Update from original (2.1.5)
Merge pull request #22 from Jojaba/master

Merge pull request #2 from pderksen/master