Bug577

This pull request fix issue #577 for all supported languages. Note that I was mainly using Google Translator for languages other than Polish.