Translation

Most up-to date version
Merge pull request #601 from aliceingame/master

Translation