use variables for links inside of strings so as to make them localizable
nit: period at end of sentence should not be part of the link
fix merge conflict
remove all l10n calls for computing variables that shouldn't be translated
also remove wrong l10n calls in glossary.html
Merge pull request #2 from pascalchevrel/Bug851143-l10n-string-fixes

use variables for links inside of strings so as to make them localizable