Merge pull request #2495 from nabinhait/fix1

Translation fixes