changing translation method to catalog
changing translation method to catalog
Merge branch 'dev'