Tag i18n strings in templates
Merge pull request #247 from edx/will/i18n

Tag i18n strings in templates