Mostly cosmetic changes
Merge pull request #280 from SergeyChepurin/SergeyChepurin/wps_i18n

Mostly cosmetic changes