Remove duplicate Solr schema field declarations
Include link text in blocktrans block

Rebased from #1107
Correct pluralisation of string

Rebased from #1107