Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).
You can't concatenate strings that you pass to gettext, because the translation string scraping won't find the strings in question. This means that you'll only ever get English results back for this.