Improve contrib localization
Merge pull request #2870 from federicobond/improve-contrib-localization

Improve contrib localization