Fixed installer message escaping, unified usage (fixes #2211)

Same entity was already fixed in a different file,
we can't have them use different strings, so used the new one instead.
Merge branch '3.1'