Adding translated-snippets
Merge pull request #962 in master
Merge pull request #954
Merge pull request #954 in develop