inserting django translation tags in html
more translation tags
Merge branch 'translation'