Added support for more than one substitution token type for resource strings.