Merge pull request #537 from NicoleRauch/master

Internationalization :-)