UPD: small fixes
UPD: small fixes for i18n
UPD: small fixes
Merge pull request #912 from angel-kulikov/master

UPD: small fixes