core-4914 update text for filtered items.
core-5038 externalize strings for coge integration
Merge branch 'master' into STABLE