#918 - Some changes in translation categories before translate
Merge branch 'master' into nestedset-comments-v2