Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).
You shouldn't concatenate translated strings like this, as it will be hard to create a reasonable sentence in some languages. I suggested having two full strings, one including the filter message and one not.