Translation of new elements
Merge branch 'pr/200'

Conflicts:
	app/locale/fr.coffee