gettext en language
Merge branch 'angular' into demo