Merge pull request #26 from nmirasch/master

BZ:1043833 - Translation issues(cherry picked from commit aae745fa3b28fac670b6282d8c5f5dbd5ae14eb3)