Incorrect reporting of missing properties in generate properties

[pram]

Where there are multiple @.....@ values on a single line in the property templates it reports that a property from the first @ to the last is missing.

Suggest tokenizing using a regex