diff --git a/org.hl7.fhir.validation/src/main/resources/Messages.properties b/org.hl7.fhir.validation/src/main/resources/Messages.properties
index 001b8b057..5a4646466 100644
--- a/org.hl7.fhir.validation/src/main/resources/Messages.properties
+++ b/org.hl7.fhir.validation/src/main/resources/Messages.properties
@@ -1,46 +1,46 @@
 #InstanceValidator
 Bundle_BUNDLE_Entry_Canonical = The canonical URL ({0}) cannot match the fullUrl ({1}) unless on the canonical server itself
 Bundle_BUNDLE_Entry_Document = The first entry in a document must be a composition
-Bundle_BUNDLE_Entry_IdUrlMismatch = Resource ID does not match the ID in the entry full URL ('{0}' vs '{1}') 
+Bundle_BUNDLE_Entry_IdUrlMismatch = Resource ID does not match the ID in the entry full URL ("{0}" vs "{1}") 
 Bundle_BUNDLE_Entry_MismatchIdUrl = The canonical URL ({0}) cannot match the fullUrl ({1}) unless the resource id ({2}) also matches
 Bundle_BUNDLE_Entry_NoFirst = Documents or Messages must contain at least one entry
 Bundle_BUNDLE_Entry_NoFirstResource = No resource on first entry
 Bundle_BUNDLE_Entry_NoFullUrl = Bundle entry missing fullUrl
-Bundle_BUNDLE_Entry_NoProfile = No profile found for contained resource of type '{0}'
-Bundle_BUNDLE_Entry_NotFound = Can't find '{0}' in the bundle ({1})
-Bundle_BUNDLE_Entry_Orphan = Entry {0} isn't reachable by traversing from first Bundle entry
-Bundle_BUNDLE_Entry_Type = The type '{0} is not valid - no resources allowed here
-Bundle_BUNDLE_Entry_Type2 = The type '{0}' is not valid - must be {1}
-Bundle_BUNDLE_Entry_Type3 = The type '{0}' is not valid - must be one of {1}
+Bundle_BUNDLE_Entry_NoProfile = No profile found for contained resource of type "{0}"
+Bundle_BUNDLE_Entry_NotFound = Can''t find "{0}" in the bundle ({1})
+Bundle_BUNDLE_Entry_Orphan = Entry {0} isn''t reachable by traversing from first Bundle entry
+Bundle_BUNDLE_Entry_Type = The type "{0}" is not valid - no resources allowed here
+Bundle_BUNDLE_Entry_Type2 = The type "{0}" is not valid - must be {1}
+Bundle_BUNDLE_Entry_Type3 = The type "{0}" is not valid - must be one of {1}
 Bundle_BUNDLE_FullUrl_Missing = Relative Reference appears inside Bundle whose entry is missing a fullUrl
 Bundle_BUNDLE_FullUrl_NeedVersion = Entries matching fullURL {0} should declare meta/versionId because there are version-specific references
 Bundle_BUNDLE_MultipleMatches = Multiple matches in bundle for reference {0}
 Bundle_BUNDLE_Not_Local = URN reference is not locally contained within the bundle {0}
 Bundle_MSG_Event_Count = Expected {0} but found {1} event elements
-CapabalityStatement_CS_SP_WrongType = Type mismatch - SearchParameter '{0}' type is {1}, but type here is {2}
-CodeSystem_CS_VS_IncludeDetails = CodeSystem {0} has a 'all system' value set of {1}, but the include has extra details
-CodeSystem_CS_VS_Invalid = CodeSystem {0} has a 'all system' value set of {1}, but doesn't have a single include
-CodeSystem_CS_VS_MisMatch = CodeSystem {0} has a 'all system' value set of {1}, but it is an expansion
-CodeSystem_CS_VS_WrongSystem = CodeSystem {0} has a 'all system' value set of {1}, but doesn't have a matching system ({2})
+CapabalityStatement_CS_SP_WrongType = Type mismatch - SearchParameter "{0}" type is {1}, but type here is {2}
+CodeSystem_CS_VS_IncludeDetails = CodeSystem {0} has a ''all system'' value set of {1}, but the include has extra details
+CodeSystem_CS_VS_Invalid = CodeSystem {0} has a ''all system'' value set of {1}, but doesn''t have a single include
+CodeSystem_CS_VS_MisMatch = CodeSystem {0} has a ''all system'' value set of {1}, but it is an expansion
+CodeSystem_CS_VS_WrongSystem = CodeSystem {0} has a ''all system'' value set of {1}, but doesn''t have a matching system ({2})
 Extension_EXT_Context_Wrong = The extension {0} is not allowed to be used at this point (allowed = {1}; this element is [{2})
 Extension_EXT_Count_Mismatch = Extensions count mismatch: expected {0} but found {1}
 Extension_EXT_Count_NotFound = Extension count mismatch: unable to find extension: {0}
-Extension_EXT_Fixed_Banned = No extensions allowed, as the specified fixed value doesn't contain any extensions
+Extension_EXT_Fixed_Banned = No extensions allowed, as the specified fixed value doesn''t contain any extensions
 Extension_EXT_Modifier_MismatchN = Extension modifier mismatch: the extension element is not labelled as a modifier, but the underlying extension is
 Extension_EXT_Modifier_MismatchY = Extension modifier mismatch: the extension element is labelled as a modifier, but the underlying extension is not
-Extension_EXT_Modifier_N = The Extension '{0}' must not be used as an extension (it's a modifierExtension)
-Extension_EXT_Modifier_Y = The Extension '{0}' must be used as a modifierExtension
-Extension_EXT_Simple = The Extension '{0}' definition is for a simple extension, so it must contain a value, not extensions
-Extension_EXT_SubExtension_Invalid = Sub-extension url '{0}' is not defined by the Extension {1}
-Extension_EXT_Type = The Extension '{0}' definition allows for the types {1} but found type {2}
+Extension_EXT_Modifier_N = The Extension "{0}" must not be used as an extension (it''s a modifierExtension)
+Extension_EXT_Modifier_Y = The Extension "{0}" must be used as a modifierExtension
+Extension_EXT_Simple = The Extension "{0}" definition is for a simple extension, so it must contain a value, not extensions
+Extension_EXT_SubExtension_Invalid = Sub-extension url "{0}" is not defined by the Extension {1}
+Extension_EXT_Type = The Extension "{0}" definition allows for the types {1} but found type {2}
 Extension_EXT_URL_Absolute = Extension.url must be an absolute URL
 Extension_EXT_Unknown = Unknown extension {0}
 Extension_EXT_Unknown_NotHere = The extension {0} is unknown, and not allowed here
 Extension_EXT_Url_NotFound = Extension.url is required
-Extension_EXT_Version_Internal = Extension url '{0}' evaluation state illegal
-Extension_EXT_Version_Invalid = Extension url '{0}' is not valid (invalid Version '{1}')
-Extension_EXT_Version_InvalidId = Extension url '{0}' is not valid (invalid Element id '{1}')
-Extension_EXT_Version_NoChange = Extension url '{0}' is not valid (Element id '{1}' is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)
+Extension_EXT_Version_Internal = Extension url "{0}" evaluation state illegal
+Extension_EXT_Version_Invalid = Extension url "{0}" is not valid (invalid Version "{1}")
+Extension_EXT_Version_InvalidId = Extension url "{0}" is not valid (invalid Element id "{1}")
+Extension_EXT_Version_NoChange = Extension url "{0}" is not valid (Element id "{1}" is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)
 Fixed_Type_Checks_DT_Address_Line = Expected {0} but found {1} line elements
 Fixed_Type_Checks_DT_Name_Family = Expected {0} but found {1} family elements
 Fixed_Type_Checks_DT_Name_Given = Expected {0} but found {1} given elements
@@ -53,9 +53,9 @@ Language_XHTML_Lang_Missing1 = Resource has a language, but the XHTML does not h
 Language_XHTML_Lang_Missing2 = Resource has a language, but the XHTML does not have a lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)
 Language_XHTML_Lang_Missing3 = Resource has a language, but the XHTML does not have an xml:lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)
 Meta_RES_Security_Duplicate = Duplicate Security Label {0}
-MustSupport_VAL_MustSupport = The element {0} is not marked as 'mustSupport' in the profile {1}. Consider not using the element, or marking the element as must-Support in the profile
-Profile_EXT_Not_Here = The extension {0} is not allowed to be used at this point (based on context invariant '{1}')
-Profile_VAL_MissingElement = Missing element '{0}' - required by fixed value assigned in profile {1}
+MustSupport_VAL_MustSupport = The element {0} is not marked as ''mustSupport'' in the profile {1}. Consider not using the element, or marking the element as must-Support in the profile
+Profile_EXT_Not_Here = The extension {0} is not allowed to be used at this point (based on context invariant "{1}")
+Profile_VAL_MissingElement = Missing element "{0}" - required by fixed value assigned in profile {1}
 Profile_VAL_NotAllowed = The element {0} is present in the instance but not allowed in the applicable {1} specified in profile
 Questionnaire_QR_Item_BadOption = The value provided ({0}::{1}) is not in the options value set in the questionnaire
 Questionnaire_QR_Item_Coding = Error {0} validating Coding against Questionnaire Options
@@ -68,7 +68,7 @@ Questionnaire_QR_Item_Missing = No response answer found for required item {0}
 Questionnaire_QR_Item_NoCoding = The code {0}::{1} is not a valid option
 Questionnaire_QR_Item_NoDate = The date {0} is not a valid option
 Questionnaire_QR_Item_NoInteger = The integer {0} is not a valid option
-Questionnaire_QR_Item_NoLinkId = No LinkId, so can't be validated
+Questionnaire_QR_Item_NoLinkId = No LinkId, so can''t be validated
 Questionnaire_QR_Item_NoOptions = Cannot validate options because no option or options are provided
 Questionnaire_QR_Item_NoOptionsCoding = Option list has no option values of type coding
 Questionnaire_QR_Item_NoOptionsDate = Option list has no option values of type date
@@ -79,8 +79,8 @@ Questionnaire_QR_Item_NoString = The string {0} is not a valid option
 Questionnaire_QR_Item_NoTime = The time {0} is not a valid option
 Questionnaire_QR_Item_NoType = Definition for item {0} does not contain a type
 Questionnaire_QR_Item_NotEnabled = Item has answer (2), even though it is not enabled {0}
-Questionnaire_QR_Item_NotEnabled2 = Item has answer, even though it is not enabled (item id = '{0}')
-Questionnaire_QR_Item_NotFound = LinkId '{0}' not found in questionnaire
+Questionnaire_QR_Item_NotEnabled2 = Item has answer, even though it is not enabled (item id = "{0}")
+Questionnaire_QR_Item_NotFound = LinkId "{0}" not found in questionnaire
 Questionnaire_QR_Item_OnlyOneA = Only one response answer item with this linkId allowed
 Questionnaire_QR_Item_OnlyOneI = Only one response item with this linkId allowed - {0}
 Questionnaire_QR_Item_Order = Structural Error: items are out of order
@@ -90,19 +90,19 @@ Questionnaire_QR_Item_TimeNoOptions = Cannot validate time answer option because
 Questionnaire_QR_Item_WrongType = Answer value must be of type {0}
 Questionnaire_QR_Item_WrongType2 = Answer value must be one of the types {0}
 Questionnaire_QR_Q_None = No questionnaire is identified, so no validation can be performed against the base questionnaire
-Questionnaire_QR_Q_NotFound = The questionnaire '{0}' could not be resolved, so no validation can be performed against the base questionnaire
+Questionnaire_QR_Q_NotFound = The questionnaire "{0}" could not be resolved, so no validation can be performed against the base questionnaire
 Questionnaire_Q_EnableWhen_After = The target of this enableWhen rule ({0}) comes after the question itself
-Questionnaire_Q_EnableWhen_IsInner = Questions with an enableWhen cannot refer to an inner question for it's enableWhen condition
+Questionnaire_Q_EnableWhen_IsInner = Questions with an enableWhen cannot refer to an inner question for it''s enableWhen condition
 Questionnaire_Q_EnableWhen_NoLink = Questions with an enableWhen must have a value for the question link
-Questionnaire_Q_EnableWhen_NoTarget = Unable to find target '{0}' for this question enableWhen
-Questionnaire_Q_EnableWhen_Self = Target for this question enableWhen can't reference itself
-Reference_REF_Aggregation = Reference is {0} which isn't supported by the specified aggregation mode(s) for the reference
+Questionnaire_Q_EnableWhen_NoTarget = Unable to find target "{0}" for this question enableWhen
+Questionnaire_Q_EnableWhen_Self = Target for this question enableWhen can''t reference itself
+Reference_REF_Aggregation = Reference is {0} which isn''t supported by the specified aggregation mode(s) for the reference
 Reference_REF_BadTargetType = Invalid Resource target type. Found {0}, but expected one of ({1})
-Reference_REF_BadTargetType2 = The type '{0}' implied by the reference URL {1} is not a valid Target for this element (must be one of {2})
+Reference_REF_BadTargetType2 = The type "{0}" implied by the reference URL {1} is not a valid Target for this element (must be one of {2})
 Reference_REF_CantMatchChoice = Unable to find matching profile for {0} among choices: {1}
 Reference_REF_CantMatchType = Unable to find matching profile for {0} (by type) among choices: {1}
-Reference_REF_CantResolve = Unable to resolve resource '{0}'
-Reference_REF_CantResolveProfile = Unable to resolve the profile reference '{0}'
+Reference_REF_CantResolve = Unable to resolve resource "{0}"
+Reference_REF_CantResolveProfile = Unable to resolve the profile reference "{0}"
 Reference_REF_Format1 = Relative URLs must be of the format [ResourceName]/[id], or a search ULR is allowed ([type]?parameters.  Encountered {0})
 Reference_REF_Format2 = Relative URLs must be of the format [ResourceName]/[id].  Encountered {0}
 Reference_REF_MultipleMatches = Found multiple matching profiles for {0} among choices: {1}
@@ -110,16 +110,16 @@ Reference_REF_NoDisplay = A Reference without an actual reference or identifier
 Reference_REF_NoType = Unable to determine type of target resource
 Reference_REF_NotFound_Bundle = Bundled or contained reference not found within the bundle/resource {0}
 Reference_REF_ResourceType = Matching reference for reference {0} has resourceType {1}
-Reference_REF_WrongTarget = The type '{0}' is not a valid Target for this element (must be one of {1})
+Reference_REF_WrongTarget = The type "{0}" is not a valid Target for this element (must be one of {1})
 Resource_RES_ID_Missing = Resource requires an id, but none is present
 Resource_RES_ID_Prohibited = Resource has an id, but none is allowed
-Terminology_PassThrough_TX_Message = {0} for '{1}#{2}'
+Terminology_PassThrough_TX_Message = {0} for "{1}#{2}"
 Terminology_TX_Binding_CantCheck = Binding by URI reference cannot be checked
 Terminology_TX_Binding_Missing = Binding for {0} missing (cc)
 Terminology_TX_Binding_Missing2 = Binding for {0} missing
 Terminology_TX_Binding_NoServer = The value provided could not be validated in the absence of a terminology server
-Terminology_TX_Binding_NoSource = Binding for path {0} has no source, so can't be checked
-Terminology_TX_Binding_NoSource2 = Binding has no source, so can't be checked
+Terminology_TX_Binding_NoSource = Binding for path {0} has no source, so can''t be checked
+Terminology_TX_Binding_NoSource2 = Binding has no source, so can''t be checked
 Terminology_TX_Code_NotValid = Code {0} is not a valid code in code system {1}
 Terminology_TX_Code_Unknown = Unknown Code ({0}#{1})
 Terminology_TX_Code_ValueSet = No code provided, and a code is required from the value set {0} ({1})
@@ -132,7 +132,7 @@ Terminology_TX_Confirm_3 = Could not confirm that the codes provided are in the
 Terminology_TX_Confirm_4 = Could not confirm that the codes provided are in the value set {0}, and a code from this value set is required
 Terminology_TX_Confirm_5 = Could not confirm that the codes provided are in the value set {0}, and a code should come from this value set unless it has no suitable code
 Terminology_TX_Confirm_6 = Could not confirm that the codes provided are in the value set {0}, and a code is recommended to come from this value set
-Terminology_TX_Display_Wrong = Display should be '{0}'
+Terminology_TX_Display_Wrong = Display should be "{0}"
 Terminology_TX_Error_CodeableConcept = Error {0} validating CodeableConcept
 Terminology_TX_Error_CodeableConcept_Max = Error {0} validating CodeableConcept using maxValueSet
 Terminology_TX_Error_Coding1 = Error {0} validating Coding
@@ -143,10 +143,10 @@ Terminology_TX_NoValid_11 = The code provided is not in the maximum value set {0
 Terminology_TX_NoValid_12 = The Coding provided is not in the value set {0}, and a code is required from this value set. {1}
 Terminology_TX_NoValid_13 = The Coding provided is not in the value set {0}, and a code should come from this value set unless it has no suitable code. {1}
 Terminology_TX_NoValid_14 = The Coding provided is not in the value set {0}, and a code is recommended to come from this value set. {1}
-Terminology_TX_NoValid_15 = The value provided ('{0}') could not be validated in the absence of a terminology server
-Terminology_TX_NoValid_16 = The value provided ('{0}') is not in the value set {1} ({2}, and a code is required from this value set){3}
-Terminology_TX_NoValid_17 = The value provided ('{0}') is not in the value set {1} ({2}, and a code should come from this value set unless it has no suitable code){3}
-Terminology_TX_NoValid_18 = The value provided ('{0}') is not in the value set {1} ({2}, and a code is recommended to come from this value set){3}
+Terminology_TX_NoValid_15 = The value provided ("{0}") could not be validated in the absence of a terminology server
+Terminology_TX_NoValid_16 = The value provided ("{0}") is not in the value set {1} ({2}, and a code is required from this value set){3}
+Terminology_TX_NoValid_17 = The value provided ("{0}") is not in the value set {1} ({2}, and a code should come from this value set unless it has no suitable code){3}
+Terminology_TX_NoValid_18 = The value provided ("{0}") is not in the value set {1} ({2}, and a code is recommended to come from this value set){3}
 Terminology_TX_NoValid_2 = None of the codes provided are in the value set {0} ({1}, and a code should come from this value set unless it has no suitable code) (codes = {2})
 Terminology_TX_NoValid_3 = None of the codes provided are in the value set {0} ({1}, and a code is recommended to come from this value set) (codes = {2})
 Terminology_TX_NoValid_4 = The Coding provided is not in the value set {0}, and a code is required from this value set{1}
@@ -156,37 +156,37 @@ Terminology_TX_NoValid_7 = None of the codes provided could be validated against
 Terminology_TX_NoValid_8 = None of the codes provided are in the maximum value set {0} ({1}, and a code from this value set is required) (codes = {2})
 Terminology_TX_NoValid_9 = The code provided could not be validated against the maximum value set {0} ({1}), (error = {2})
 Terminology_TX_System_Invalid = Invalid System URI: {0}
-Terminology_TX_System_NotKnown = Code System URI '{0}' is unknown so the code cannot be validated
+Terminology_TX_System_NotKnown = Code System URI "{0}" is unknown so the code cannot be validated
 Terminology_TX_System_Relative = Coding.system must be an absolute reference, not a local reference
-Terminology_TX_System_Unknown = Unknown Code System '{0}'
+Terminology_TX_System_Unknown = Unknown Code System "{0}"
 Terminology_TX_System_ValueSet = Invalid System URI: {0} - cannot use a value set URI as a system
-Terminology_TX_System_ValueSet2 = The Coding references a value set, not a code system ('{0}')
+Terminology_TX_System_ValueSet2 = The Coding references a value set, not a code system ("{0}")
 Terminology_TX_ValueSet_NotFound = ValueSet {0} not found by validator
 Terminology_TX_ValueSet_NotFound2 = ValueSet {0} not found by validator
-Type_Specific_Checks_DT_Base64_Valid = The value '{0}' is not a valid Base64 value
-Type_Specific_Checks_DT_Boolean_Value = boolean values must be 'true' or 'false'
-Type_Specific_Checks_DT_Code_WS = The code '{0}' is not valid (whitespace rules)
-Type_Specific_Checks_DT_DateTime_Reasonable = The value '{0}' is outside the range of reasonable years - check for data entry error
-Type_Specific_Checks_DT_DateTime_Regex = The instant '{0}' is not valid (by regex)
+Type_Specific_Checks_DT_Base64_Valid = The value "{0}" is not a valid Base64 value
+Type_Specific_Checks_DT_Boolean_Value = boolean values must be ''true'' or ''false''
+Type_Specific_Checks_DT_Code_WS = The code "{0}" is not valid (whitespace rules)
+Type_Specific_Checks_DT_DateTime_Reasonable = The value "{0}" is outside the range of reasonable years - check for data entry error
+Type_Specific_Checks_DT_DateTime_Regex = The instant "{0}" is not valid (by regex)
 Type_Specific_Checks_DT_DateTime_TZ = if a date has a time, it must have a timezone
 Type_Specific_Checks_DT_DateTime_Valid = Not a valid date/time ({0})
 Type_Specific_Checks_DT_Date_Valid = Not a valid date ({0})
-Type_Specific_Checks_DT_Decimal_Range = The value '{0}' is outside the range of commonly/reasonably supported decimals
-Type_Specific_Checks_DT_Decimal_Valid = The value '{0}' is not a valid decimal
-Type_Specific_Checks_DT_ID_Valid = id value '{0}' is not valid
+Type_Specific_Checks_DT_Decimal_Range = The value "{0}" is outside the range of commonly/reasonably supported decimals
+Type_Specific_Checks_DT_Decimal_Valid = The value "{0}" is not a valid decimal
+Type_Specific_Checks_DT_ID_Valid = id value "{0}" is not valid
 Type_Specific_Checks_DT_Identifier_System = Identifier.system must be an absolute reference, not a local reference
 Type_Specific_Checks_DT_Instant_Valid = Not a valid instant ({0})
-Type_Specific_Checks_DT_Integer64_Valid = The value '{0}' is not a valid integer64
+Type_Specific_Checks_DT_Integer64_Valid = The value "{0}" is not a valid integer64
 Type_Specific_Checks_DT_Integer_GT = value is greater than permitted maximum value of {0}
 Type_Specific_Checks_DT_Integer_LT = value is less than permitted minimum value of {0}
 Type_Specific_Checks_DT_Integer_LT0 = value is less than permitted minimum value of 0
 Type_Specific_Checks_DT_Integer_LT1 = value is less than permitted minimum value of 1
-Type_Specific_Checks_DT_Integer_Valid = The value '{0}' is not a valid integer
+Type_Specific_Checks_DT_Integer_Valid = The value "{0}" is not a valid integer
 Type_Specific_Checks_DT_OID_Start = OIDs must start with urn:oid:
 Type_Specific_Checks_DT_OID_Valid = OIDs must be valid
 Type_Specific_Checks_DT_Primitive_Length = value is longer than permitted maximum length of {0}
 Type_Specific_Checks_DT_Primitive_NotEmpty = @value cannot be empty
-Type_Specific_Checks_DT_Primitive_Regex = Element value '{0}' does not meet regex '{1}'
+Type_Specific_Checks_DT_Primitive_Regex = Element value "{0}" does not meet regex "{1}"
 Type_Specific_Checks_DT_Primitive_ValueExt = Primitive types must have a value or must have child extensions
 Type_Specific_Checks_DT_Primitive_WS = Primitive types should not only be whitespace
 Type_Specific_Checks_DT_String_Length = value is longer than permitted maximum length of 1 MB (1048576 bytes)
@@ -194,8 +194,8 @@ Type_Specific_Checks_DT_String_WS = value should not start or finish with whites
 Type_Specific_Checks_DT_Time_Valid = Not a valid time ({0})
 Type_Specific_Checks_DT_URI_OID = URI values cannot start with oid:
 Type_Specific_Checks_DT_URI_UUID = URI values cannot start with uuid:
-Type_Specific_Checks_DT_URI_WS = URI values cannot have whitespace('{0}')
-Type_Specific_Checks_DT_URL_Resolve = URL value '{0}' does not resolve
+Type_Specific_Checks_DT_URI_WS = URI values cannot have whitespace("{0}")
+Type_Specific_Checks_DT_URL_Resolve = URL value "{0}" does not resolve
 Type_Specific_Checks_DT_UUID_Strat = UUIDs must start with urn:uuid:
 Type_Specific_Checks_DT_UUID_Vaid = UUIDs must be valid ({0})
 Validation_BUNDLE_Message = The first entry in a message must be a MessageHeader
@@ -206,30 +206,30 @@ Validation_VAL_Profile_Maximum = {0}: max allowed = {1}, but found {2}
 Validation_VAL_Profile_Minimum = {0}: minimum required = {1}, but only found {2}
 Validation_VAL_Profile_MultipleMatches = Found multiple matching profiles among choices: {0}
 Validation_VAL_Profile_NoCheckMax = {0}: Unable to check max allowed ({1}) due to lack of slicing validation
-Validation_VAL_Profile_NoCheckMin = {0}': Unable to check minimum required ({1}) due to lack of slicing validation
-Validation_VAL_Profile_NoDefinition = No definition found for resource type '{0}'
+Validation_VAL_Profile_NoCheckMin = {0}": Unable to check minimum required ({1}) due to lack of slicing validation
+Validation_VAL_Profile_NoDefinition = No definition found for resource type "{0}"
 Validation_VAL_Profile_NoMatch = Unable to find matching profile among choices: {0}
 Validation_VAL_Profile_NoSnapshot = StructureDefinition has no snapshot - validation is against the snapshot, so it must be provided
 Validation_VAL_Profile_NoType = The type of element {0} is not known, which is illegal. Valid types at this point are {1}
 Validation_VAL_Profile_NotAllowed = This element is not allowed by the profile {0}
 Validation_VAL_Profile_NotSlice = This element does not match any known slice {0}
-Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element '{1}' is out of order
-Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element '{1}' is out of order in ordered slice
-Validation_VAL_Profile_Unknown = Profile reference '{0}' could not be resolved, so has not been checked
-Validation_VAL_Profile_WrongType = Specified profile type was '{0}', but found type '{1}'
+Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element "{1}" is out of order
+Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element "{1}" is out of order in ordered slice
+Validation_VAL_Profile_Unknown = Profile reference "{0}" could not be resolved, so has not been checked
+Validation_VAL_Profile_WrongType = Specified profile type was "{0}", but found type "{1}"
 Validation_VAL_Unknown_Profile = Unknown profile {0}
-XHTML_XHTML_Attribute_Illegal = Illegal attribute name in the XHTML ('{0}' on '{1}')
-XHTML_XHTML_Element_Illegal = Illegal element name in the XHTML ('{0}')
-XHTML_XHTML_NS_InValid = Wrong namespace on the XHTML ('{0}', should be '{1}')
-XHTML_XHTML_Name_Invalid = Wrong name on the XHTML ('{0}') - must start with div
-_DT_Fixed_Wrong = Value is '{0}' but must be '{1}'
+XHTML_XHTML_Attribute_Illegal = Illegal attribute name in the XHTML ("{0}" on "{1}")
+XHTML_XHTML_Element_Illegal = Illegal element name in the XHTML ("{0}")
+XHTML_XHTML_NS_InValid = Wrong namespace on the XHTML ("{0}", should be "{1}")
+XHTML_XHTML_Name_Invalid = Wrong name on the XHTML ("{0}") - must start with div
+_DT_Fixed_Wrong = Value is "{0}" but must be "{1}"
 All_observations_should_have_an_effectiveDateTime_or_an_effectivePeriod = All observations should have an effectiveDateTime or an effectivePeriod
 All_observations_should_have_a_performer = All observations should have a performer
 All_observations_should_have_a_subject = All observations should have a subject
 Unable_to_resolve_slice_matching__no_fixed_value_or_required_value_set = Unable to resolve slice matching - no fixed value or required value set
 Unable_to_resolve_slice_matching__slice_matching_by_value_set_not_done = Unable to resolve slice matching - slice matching by value set not done
 Problem_processing_expression__in_profile__path__ = Problem processing expression {0} in profile {1} path {2}: {3}
-Unable_to_find_element_with_id_ = Unable to find element with id '{0}'
+Unable_to_find_element_with_id_ = Unable to find element with id "{0}"
 Slice_encountered_midway_through_set_path___id___ = Slice encountered midway through set (path = {0}, id = {1}); {2}
 Unable_to_resolve_actual_type_ = Unable to resolve actual type {0}
 Unsupported_version_R1 = Unsupported version R1
@@ -256,7 +256,7 @@ Unable_to_resolve_element__in_profile_ = Unable to resolve element {0} in profil
 Unable_to_resolve_profile_ = Unable to resolve profile {0}
 Resource_resolution_services_not_provided = Resource resolution services not provided
 Unrecognised_extension_context_ = Unrecognised extension context {0}
-Unable_to_locate_the_profile__in_order_to_validate_against_it = Unable to locate the profile '{0}' in order to validate against it
+Unable_to_locate_the_profile__in_order_to_validate_against_it = Unable to locate the profile "{0}" in order to validate against it
 Reference__refers_to_a__not_a_ValueSet = Reference {0} refers to a {1} not a ValueSet
 Not_done_yet_ValidatorHostServicesconformsToProfile_when_item_is_not_an_element = Not done yet (ValidatorHostServices.conformsToProfile), when item is not an element
 Not_supported_yet = Not supported yet
diff --git a/org.hl7.fhir.validation/src/main/resources/Messages_de_DE.properties b/org.hl7.fhir.validation/src/main/resources/Messages_de_DE.properties
index 001b8b057..5a4646466 100644
--- a/org.hl7.fhir.validation/src/main/resources/Messages_de_DE.properties
+++ b/org.hl7.fhir.validation/src/main/resources/Messages_de_DE.properties
@@ -1,46 +1,46 @@
 #InstanceValidator
 Bundle_BUNDLE_Entry_Canonical = The canonical URL ({0}) cannot match the fullUrl ({1}) unless on the canonical server itself
 Bundle_BUNDLE_Entry_Document = The first entry in a document must be a composition
-Bundle_BUNDLE_Entry_IdUrlMismatch = Resource ID does not match the ID in the entry full URL ('{0}' vs '{1}') 
+Bundle_BUNDLE_Entry_IdUrlMismatch = Resource ID does not match the ID in the entry full URL ("{0}" vs "{1}") 
 Bundle_BUNDLE_Entry_MismatchIdUrl = The canonical URL ({0}) cannot match the fullUrl ({1}) unless the resource id ({2}) also matches
 Bundle_BUNDLE_Entry_NoFirst = Documents or Messages must contain at least one entry
 Bundle_BUNDLE_Entry_NoFirstResource = No resource on first entry
 Bundle_BUNDLE_Entry_NoFullUrl = Bundle entry missing fullUrl
-Bundle_BUNDLE_Entry_NoProfile = No profile found for contained resource of type '{0}'
-Bundle_BUNDLE_Entry_NotFound = Can't find '{0}' in the bundle ({1})
-Bundle_BUNDLE_Entry_Orphan = Entry {0} isn't reachable by traversing from first Bundle entry
-Bundle_BUNDLE_Entry_Type = The type '{0} is not valid - no resources allowed here
-Bundle_BUNDLE_Entry_Type2 = The type '{0}' is not valid - must be {1}
-Bundle_BUNDLE_Entry_Type3 = The type '{0}' is not valid - must be one of {1}
+Bundle_BUNDLE_Entry_NoProfile = No profile found for contained resource of type "{0}"
+Bundle_BUNDLE_Entry_NotFound = Can''t find "{0}" in the bundle ({1})
+Bundle_BUNDLE_Entry_Orphan = Entry {0} isn''t reachable by traversing from first Bundle entry
+Bundle_BUNDLE_Entry_Type = The type "{0}" is not valid - no resources allowed here
+Bundle_BUNDLE_Entry_Type2 = The type "{0}" is not valid - must be {1}
+Bundle_BUNDLE_Entry_Type3 = The type "{0}" is not valid - must be one of {1}
 Bundle_BUNDLE_FullUrl_Missing = Relative Reference appears inside Bundle whose entry is missing a fullUrl
 Bundle_BUNDLE_FullUrl_NeedVersion = Entries matching fullURL {0} should declare meta/versionId because there are version-specific references
 Bundle_BUNDLE_MultipleMatches = Multiple matches in bundle for reference {0}
 Bundle_BUNDLE_Not_Local = URN reference is not locally contained within the bundle {0}
 Bundle_MSG_Event_Count = Expected {0} but found {1} event elements
-CapabalityStatement_CS_SP_WrongType = Type mismatch - SearchParameter '{0}' type is {1}, but type here is {2}
-CodeSystem_CS_VS_IncludeDetails = CodeSystem {0} has a 'all system' value set of {1}, but the include has extra details
-CodeSystem_CS_VS_Invalid = CodeSystem {0} has a 'all system' value set of {1}, but doesn't have a single include
-CodeSystem_CS_VS_MisMatch = CodeSystem {0} has a 'all system' value set of {1}, but it is an expansion
-CodeSystem_CS_VS_WrongSystem = CodeSystem {0} has a 'all system' value set of {1}, but doesn't have a matching system ({2})
+CapabalityStatement_CS_SP_WrongType = Type mismatch - SearchParameter "{0}" type is {1}, but type here is {2}
+CodeSystem_CS_VS_IncludeDetails = CodeSystem {0} has a ''all system'' value set of {1}, but the include has extra details
+CodeSystem_CS_VS_Invalid = CodeSystem {0} has a ''all system'' value set of {1}, but doesn''t have a single include
+CodeSystem_CS_VS_MisMatch = CodeSystem {0} has a ''all system'' value set of {1}, but it is an expansion
+CodeSystem_CS_VS_WrongSystem = CodeSystem {0} has a ''all system'' value set of {1}, but doesn''t have a matching system ({2})
 Extension_EXT_Context_Wrong = The extension {0} is not allowed to be used at this point (allowed = {1}; this element is [{2})
 Extension_EXT_Count_Mismatch = Extensions count mismatch: expected {0} but found {1}
 Extension_EXT_Count_NotFound = Extension count mismatch: unable to find extension: {0}
-Extension_EXT_Fixed_Banned = No extensions allowed, as the specified fixed value doesn't contain any extensions
+Extension_EXT_Fixed_Banned = No extensions allowed, as the specified fixed value doesn''t contain any extensions
 Extension_EXT_Modifier_MismatchN = Extension modifier mismatch: the extension element is not labelled as a modifier, but the underlying extension is
 Extension_EXT_Modifier_MismatchY = Extension modifier mismatch: the extension element is labelled as a modifier, but the underlying extension is not
-Extension_EXT_Modifier_N = The Extension '{0}' must not be used as an extension (it's a modifierExtension)
-Extension_EXT_Modifier_Y = The Extension '{0}' must be used as a modifierExtension
-Extension_EXT_Simple = The Extension '{0}' definition is for a simple extension, so it must contain a value, not extensions
-Extension_EXT_SubExtension_Invalid = Sub-extension url '{0}' is not defined by the Extension {1}
-Extension_EXT_Type = The Extension '{0}' definition allows for the types {1} but found type {2}
+Extension_EXT_Modifier_N = The Extension "{0}" must not be used as an extension (it''s a modifierExtension)
+Extension_EXT_Modifier_Y = The Extension "{0}" must be used as a modifierExtension
+Extension_EXT_Simple = The Extension "{0}" definition is for a simple extension, so it must contain a value, not extensions
+Extension_EXT_SubExtension_Invalid = Sub-extension url "{0}" is not defined by the Extension {1}
+Extension_EXT_Type = The Extension "{0}" definition allows for the types {1} but found type {2}
 Extension_EXT_URL_Absolute = Extension.url must be an absolute URL
 Extension_EXT_Unknown = Unknown extension {0}
 Extension_EXT_Unknown_NotHere = The extension {0} is unknown, and not allowed here
 Extension_EXT_Url_NotFound = Extension.url is required
-Extension_EXT_Version_Internal = Extension url '{0}' evaluation state illegal
-Extension_EXT_Version_Invalid = Extension url '{0}' is not valid (invalid Version '{1}')
-Extension_EXT_Version_InvalidId = Extension url '{0}' is not valid (invalid Element id '{1}')
-Extension_EXT_Version_NoChange = Extension url '{0}' is not valid (Element id '{1}' is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)
+Extension_EXT_Version_Internal = Extension url "{0}" evaluation state illegal
+Extension_EXT_Version_Invalid = Extension url "{0}" is not valid (invalid Version "{1}")
+Extension_EXT_Version_InvalidId = Extension url "{0}" is not valid (invalid Element id "{1}")
+Extension_EXT_Version_NoChange = Extension url "{0}" is not valid (Element id "{1}" is valid, but cannot be used in a cross-version paradigm because there has been no changes across the relevant versions)
 Fixed_Type_Checks_DT_Address_Line = Expected {0} but found {1} line elements
 Fixed_Type_Checks_DT_Name_Family = Expected {0} but found {1} family elements
 Fixed_Type_Checks_DT_Name_Given = Expected {0} but found {1} given elements
@@ -53,9 +53,9 @@ Language_XHTML_Lang_Missing1 = Resource has a language, but the XHTML does not h
 Language_XHTML_Lang_Missing2 = Resource has a language, but the XHTML does not have a lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)
 Language_XHTML_Lang_Missing3 = Resource has a language, but the XHTML does not have an xml:lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)
 Meta_RES_Security_Duplicate = Duplicate Security Label {0}
-MustSupport_VAL_MustSupport = The element {0} is not marked as 'mustSupport' in the profile {1}. Consider not using the element, or marking the element as must-Support in the profile
-Profile_EXT_Not_Here = The extension {0} is not allowed to be used at this point (based on context invariant '{1}')
-Profile_VAL_MissingElement = Missing element '{0}' - required by fixed value assigned in profile {1}
+MustSupport_VAL_MustSupport = The element {0} is not marked as ''mustSupport'' in the profile {1}. Consider not using the element, or marking the element as must-Support in the profile
+Profile_EXT_Not_Here = The extension {0} is not allowed to be used at this point (based on context invariant "{1}")
+Profile_VAL_MissingElement = Missing element "{0}" - required by fixed value assigned in profile {1}
 Profile_VAL_NotAllowed = The element {0} is present in the instance but not allowed in the applicable {1} specified in profile
 Questionnaire_QR_Item_BadOption = The value provided ({0}::{1}) is not in the options value set in the questionnaire
 Questionnaire_QR_Item_Coding = Error {0} validating Coding against Questionnaire Options
@@ -68,7 +68,7 @@ Questionnaire_QR_Item_Missing = No response answer found for required item {0}
 Questionnaire_QR_Item_NoCoding = The code {0}::{1} is not a valid option
 Questionnaire_QR_Item_NoDate = The date {0} is not a valid option
 Questionnaire_QR_Item_NoInteger = The integer {0} is not a valid option
-Questionnaire_QR_Item_NoLinkId = No LinkId, so can't be validated
+Questionnaire_QR_Item_NoLinkId = No LinkId, so can''t be validated
 Questionnaire_QR_Item_NoOptions = Cannot validate options because no option or options are provided
 Questionnaire_QR_Item_NoOptionsCoding = Option list has no option values of type coding
 Questionnaire_QR_Item_NoOptionsDate = Option list has no option values of type date
@@ -79,8 +79,8 @@ Questionnaire_QR_Item_NoString = The string {0} is not a valid option
 Questionnaire_QR_Item_NoTime = The time {0} is not a valid option
 Questionnaire_QR_Item_NoType = Definition for item {0} does not contain a type
 Questionnaire_QR_Item_NotEnabled = Item has answer (2), even though it is not enabled {0}
-Questionnaire_QR_Item_NotEnabled2 = Item has answer, even though it is not enabled (item id = '{0}')
-Questionnaire_QR_Item_NotFound = LinkId '{0}' not found in questionnaire
+Questionnaire_QR_Item_NotEnabled2 = Item has answer, even though it is not enabled (item id = "{0}")
+Questionnaire_QR_Item_NotFound = LinkId "{0}" not found in questionnaire
 Questionnaire_QR_Item_OnlyOneA = Only one response answer item with this linkId allowed
 Questionnaire_QR_Item_OnlyOneI = Only one response item with this linkId allowed - {0}
 Questionnaire_QR_Item_Order = Structural Error: items are out of order
@@ -90,19 +90,19 @@ Questionnaire_QR_Item_TimeNoOptions = Cannot validate time answer option because
 Questionnaire_QR_Item_WrongType = Answer value must be of type {0}
 Questionnaire_QR_Item_WrongType2 = Answer value must be one of the types {0}
 Questionnaire_QR_Q_None = No questionnaire is identified, so no validation can be performed against the base questionnaire
-Questionnaire_QR_Q_NotFound = The questionnaire '{0}' could not be resolved, so no validation can be performed against the base questionnaire
+Questionnaire_QR_Q_NotFound = The questionnaire "{0}" could not be resolved, so no validation can be performed against the base questionnaire
 Questionnaire_Q_EnableWhen_After = The target of this enableWhen rule ({0}) comes after the question itself
-Questionnaire_Q_EnableWhen_IsInner = Questions with an enableWhen cannot refer to an inner question for it's enableWhen condition
+Questionnaire_Q_EnableWhen_IsInner = Questions with an enableWhen cannot refer to an inner question for it''s enableWhen condition
 Questionnaire_Q_EnableWhen_NoLink = Questions with an enableWhen must have a value for the question link
-Questionnaire_Q_EnableWhen_NoTarget = Unable to find target '{0}' for this question enableWhen
-Questionnaire_Q_EnableWhen_Self = Target for this question enableWhen can't reference itself
-Reference_REF_Aggregation = Reference is {0} which isn't supported by the specified aggregation mode(s) for the reference
+Questionnaire_Q_EnableWhen_NoTarget = Unable to find target "{0}" for this question enableWhen
+Questionnaire_Q_EnableWhen_Self = Target for this question enableWhen can''t reference itself
+Reference_REF_Aggregation = Reference is {0} which isn''t supported by the specified aggregation mode(s) for the reference
 Reference_REF_BadTargetType = Invalid Resource target type. Found {0}, but expected one of ({1})
-Reference_REF_BadTargetType2 = The type '{0}' implied by the reference URL {1} is not a valid Target for this element (must be one of {2})
+Reference_REF_BadTargetType2 = The type "{0}" implied by the reference URL {1} is not a valid Target for this element (must be one of {2})
 Reference_REF_CantMatchChoice = Unable to find matching profile for {0} among choices: {1}
 Reference_REF_CantMatchType = Unable to find matching profile for {0} (by type) among choices: {1}
-Reference_REF_CantResolve = Unable to resolve resource '{0}'
-Reference_REF_CantResolveProfile = Unable to resolve the profile reference '{0}'
+Reference_REF_CantResolve = Unable to resolve resource "{0}"
+Reference_REF_CantResolveProfile = Unable to resolve the profile reference "{0}"
 Reference_REF_Format1 = Relative URLs must be of the format [ResourceName]/[id], or a search ULR is allowed ([type]?parameters.  Encountered {0})
 Reference_REF_Format2 = Relative URLs must be of the format [ResourceName]/[id].  Encountered {0}
 Reference_REF_MultipleMatches = Found multiple matching profiles for {0} among choices: {1}
@@ -110,16 +110,16 @@ Reference_REF_NoDisplay = A Reference without an actual reference or identifier
 Reference_REF_NoType = Unable to determine type of target resource
 Reference_REF_NotFound_Bundle = Bundled or contained reference not found within the bundle/resource {0}
 Reference_REF_ResourceType = Matching reference for reference {0} has resourceType {1}
-Reference_REF_WrongTarget = The type '{0}' is not a valid Target for this element (must be one of {1})
+Reference_REF_WrongTarget = The type "{0}" is not a valid Target for this element (must be one of {1})
 Resource_RES_ID_Missing = Resource requires an id, but none is present
 Resource_RES_ID_Prohibited = Resource has an id, but none is allowed
-Terminology_PassThrough_TX_Message = {0} for '{1}#{2}'
+Terminology_PassThrough_TX_Message = {0} for "{1}#{2}"
 Terminology_TX_Binding_CantCheck = Binding by URI reference cannot be checked
 Terminology_TX_Binding_Missing = Binding for {0} missing (cc)
 Terminology_TX_Binding_Missing2 = Binding for {0} missing
 Terminology_TX_Binding_NoServer = The value provided could not be validated in the absence of a terminology server
-Terminology_TX_Binding_NoSource = Binding for path {0} has no source, so can't be checked
-Terminology_TX_Binding_NoSource2 = Binding has no source, so can't be checked
+Terminology_TX_Binding_NoSource = Binding for path {0} has no source, so can''t be checked
+Terminology_TX_Binding_NoSource2 = Binding has no source, so can''t be checked
 Terminology_TX_Code_NotValid = Code {0} is not a valid code in code system {1}
 Terminology_TX_Code_Unknown = Unknown Code ({0}#{1})
 Terminology_TX_Code_ValueSet = No code provided, and a code is required from the value set {0} ({1})
@@ -132,7 +132,7 @@ Terminology_TX_Confirm_3 = Could not confirm that the codes provided are in the
 Terminology_TX_Confirm_4 = Could not confirm that the codes provided are in the value set {0}, and a code from this value set is required
 Terminology_TX_Confirm_5 = Could not confirm that the codes provided are in the value set {0}, and a code should come from this value set unless it has no suitable code
 Terminology_TX_Confirm_6 = Could not confirm that the codes provided are in the value set {0}, and a code is recommended to come from this value set
-Terminology_TX_Display_Wrong = Display should be '{0}'
+Terminology_TX_Display_Wrong = Display should be "{0}"
 Terminology_TX_Error_CodeableConcept = Error {0} validating CodeableConcept
 Terminology_TX_Error_CodeableConcept_Max = Error {0} validating CodeableConcept using maxValueSet
 Terminology_TX_Error_Coding1 = Error {0} validating Coding
@@ -143,10 +143,10 @@ Terminology_TX_NoValid_11 = The code provided is not in the maximum value set {0
 Terminology_TX_NoValid_12 = The Coding provided is not in the value set {0}, and a code is required from this value set. {1}
 Terminology_TX_NoValid_13 = The Coding provided is not in the value set {0}, and a code should come from this value set unless it has no suitable code. {1}
 Terminology_TX_NoValid_14 = The Coding provided is not in the value set {0}, and a code is recommended to come from this value set. {1}
-Terminology_TX_NoValid_15 = The value provided ('{0}') could not be validated in the absence of a terminology server
-Terminology_TX_NoValid_16 = The value provided ('{0}') is not in the value set {1} ({2}, and a code is required from this value set){3}
-Terminology_TX_NoValid_17 = The value provided ('{0}') is not in the value set {1} ({2}, and a code should come from this value set unless it has no suitable code){3}
-Terminology_TX_NoValid_18 = The value provided ('{0}') is not in the value set {1} ({2}, and a code is recommended to come from this value set){3}
+Terminology_TX_NoValid_15 = The value provided ("{0}") could not be validated in the absence of a terminology server
+Terminology_TX_NoValid_16 = The value provided ("{0}") is not in the value set {1} ({2}, and a code is required from this value set){3}
+Terminology_TX_NoValid_17 = The value provided ("{0}") is not in the value set {1} ({2}, and a code should come from this value set unless it has no suitable code){3}
+Terminology_TX_NoValid_18 = The value provided ("{0}") is not in the value set {1} ({2}, and a code is recommended to come from this value set){3}
 Terminology_TX_NoValid_2 = None of the codes provided are in the value set {0} ({1}, and a code should come from this value set unless it has no suitable code) (codes = {2})
 Terminology_TX_NoValid_3 = None of the codes provided are in the value set {0} ({1}, and a code is recommended to come from this value set) (codes = {2})
 Terminology_TX_NoValid_4 = The Coding provided is not in the value set {0}, and a code is required from this value set{1}
@@ -156,37 +156,37 @@ Terminology_TX_NoValid_7 = None of the codes provided could be validated against
 Terminology_TX_NoValid_8 = None of the codes provided are in the maximum value set {0} ({1}, and a code from this value set is required) (codes = {2})
 Terminology_TX_NoValid_9 = The code provided could not be validated against the maximum value set {0} ({1}), (error = {2})
 Terminology_TX_System_Invalid = Invalid System URI: {0}
-Terminology_TX_System_NotKnown = Code System URI '{0}' is unknown so the code cannot be validated
+Terminology_TX_System_NotKnown = Code System URI "{0}" is unknown so the code cannot be validated
 Terminology_TX_System_Relative = Coding.system must be an absolute reference, not a local reference
-Terminology_TX_System_Unknown = Unknown Code System '{0}'
+Terminology_TX_System_Unknown = Unknown Code System "{0}"
 Terminology_TX_System_ValueSet = Invalid System URI: {0} - cannot use a value set URI as a system
-Terminology_TX_System_ValueSet2 = The Coding references a value set, not a code system ('{0}')
+Terminology_TX_System_ValueSet2 = The Coding references a value set, not a code system ("{0}")
 Terminology_TX_ValueSet_NotFound = ValueSet {0} not found by validator
 Terminology_TX_ValueSet_NotFound2 = ValueSet {0} not found by validator
-Type_Specific_Checks_DT_Base64_Valid = The value '{0}' is not a valid Base64 value
-Type_Specific_Checks_DT_Boolean_Value = boolean values must be 'true' or 'false'
-Type_Specific_Checks_DT_Code_WS = The code '{0}' is not valid (whitespace rules)
-Type_Specific_Checks_DT_DateTime_Reasonable = The value '{0}' is outside the range of reasonable years - check for data entry error
-Type_Specific_Checks_DT_DateTime_Regex = The instant '{0}' is not valid (by regex)
+Type_Specific_Checks_DT_Base64_Valid = The value "{0}" is not a valid Base64 value
+Type_Specific_Checks_DT_Boolean_Value = boolean values must be ''true'' or ''false''
+Type_Specific_Checks_DT_Code_WS = The code "{0}" is not valid (whitespace rules)
+Type_Specific_Checks_DT_DateTime_Reasonable = The value "{0}" is outside the range of reasonable years - check for data entry error
+Type_Specific_Checks_DT_DateTime_Regex = The instant "{0}" is not valid (by regex)
 Type_Specific_Checks_DT_DateTime_TZ = if a date has a time, it must have a timezone
 Type_Specific_Checks_DT_DateTime_Valid = Not a valid date/time ({0})
 Type_Specific_Checks_DT_Date_Valid = Not a valid date ({0})
-Type_Specific_Checks_DT_Decimal_Range = The value '{0}' is outside the range of commonly/reasonably supported decimals
-Type_Specific_Checks_DT_Decimal_Valid = The value '{0}' is not a valid decimal
-Type_Specific_Checks_DT_ID_Valid = id value '{0}' is not valid
+Type_Specific_Checks_DT_Decimal_Range = The value "{0}" is outside the range of commonly/reasonably supported decimals
+Type_Specific_Checks_DT_Decimal_Valid = The value "{0}" is not a valid decimal
+Type_Specific_Checks_DT_ID_Valid = id value "{0}" is not valid
 Type_Specific_Checks_DT_Identifier_System = Identifier.system must be an absolute reference, not a local reference
 Type_Specific_Checks_DT_Instant_Valid = Not a valid instant ({0})
-Type_Specific_Checks_DT_Integer64_Valid = The value '{0}' is not a valid integer64
+Type_Specific_Checks_DT_Integer64_Valid = The value "{0}" is not a valid integer64
 Type_Specific_Checks_DT_Integer_GT = value is greater than permitted maximum value of {0}
 Type_Specific_Checks_DT_Integer_LT = value is less than permitted minimum value of {0}
 Type_Specific_Checks_DT_Integer_LT0 = value is less than permitted minimum value of 0
 Type_Specific_Checks_DT_Integer_LT1 = value is less than permitted minimum value of 1
-Type_Specific_Checks_DT_Integer_Valid = The value '{0}' is not a valid integer
+Type_Specific_Checks_DT_Integer_Valid = The value "{0}" is not a valid integer
 Type_Specific_Checks_DT_OID_Start = OIDs must start with urn:oid:
 Type_Specific_Checks_DT_OID_Valid = OIDs must be valid
 Type_Specific_Checks_DT_Primitive_Length = value is longer than permitted maximum length of {0}
 Type_Specific_Checks_DT_Primitive_NotEmpty = @value cannot be empty
-Type_Specific_Checks_DT_Primitive_Regex = Element value '{0}' does not meet regex '{1}'
+Type_Specific_Checks_DT_Primitive_Regex = Element value "{0}" does not meet regex "{1}"
 Type_Specific_Checks_DT_Primitive_ValueExt = Primitive types must have a value or must have child extensions
 Type_Specific_Checks_DT_Primitive_WS = Primitive types should not only be whitespace
 Type_Specific_Checks_DT_String_Length = value is longer than permitted maximum length of 1 MB (1048576 bytes)
@@ -194,8 +194,8 @@ Type_Specific_Checks_DT_String_WS = value should not start or finish with whites
 Type_Specific_Checks_DT_Time_Valid = Not a valid time ({0})
 Type_Specific_Checks_DT_URI_OID = URI values cannot start with oid:
 Type_Specific_Checks_DT_URI_UUID = URI values cannot start with uuid:
-Type_Specific_Checks_DT_URI_WS = URI values cannot have whitespace('{0}')
-Type_Specific_Checks_DT_URL_Resolve = URL value '{0}' does not resolve
+Type_Specific_Checks_DT_URI_WS = URI values cannot have whitespace("{0}")
+Type_Specific_Checks_DT_URL_Resolve = URL value "{0}" does not resolve
 Type_Specific_Checks_DT_UUID_Strat = UUIDs must start with urn:uuid:
 Type_Specific_Checks_DT_UUID_Vaid = UUIDs must be valid ({0})
 Validation_BUNDLE_Message = The first entry in a message must be a MessageHeader
@@ -206,30 +206,30 @@ Validation_VAL_Profile_Maximum = {0}: max allowed = {1}, but found {2}
 Validation_VAL_Profile_Minimum = {0}: minimum required = {1}, but only found {2}
 Validation_VAL_Profile_MultipleMatches = Found multiple matching profiles among choices: {0}
 Validation_VAL_Profile_NoCheckMax = {0}: Unable to check max allowed ({1}) due to lack of slicing validation
-Validation_VAL_Profile_NoCheckMin = {0}': Unable to check minimum required ({1}) due to lack of slicing validation
-Validation_VAL_Profile_NoDefinition = No definition found for resource type '{0}'
+Validation_VAL_Profile_NoCheckMin = {0}": Unable to check minimum required ({1}) due to lack of slicing validation
+Validation_VAL_Profile_NoDefinition = No definition found for resource type "{0}"
 Validation_VAL_Profile_NoMatch = Unable to find matching profile among choices: {0}
 Validation_VAL_Profile_NoSnapshot = StructureDefinition has no snapshot - validation is against the snapshot, so it must be provided
 Validation_VAL_Profile_NoType = The type of element {0} is not known, which is illegal. Valid types at this point are {1}
 Validation_VAL_Profile_NotAllowed = This element is not allowed by the profile {0}
 Validation_VAL_Profile_NotSlice = This element does not match any known slice {0}
-Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element '{1}' is out of order
-Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element '{1}' is out of order in ordered slice
-Validation_VAL_Profile_Unknown = Profile reference '{0}' could not be resolved, so has not been checked
-Validation_VAL_Profile_WrongType = Specified profile type was '{0}', but found type '{1}'
+Validation_VAL_Profile_OutOfOrder = As specified by profile {0}, Element "{1}" is out of order
+Validation_VAL_Profile_SliceOrder = As specified by profile {0}, Element "{1}" is out of order in ordered slice
+Validation_VAL_Profile_Unknown = Profile reference "{0}" could not be resolved, so has not been checked
+Validation_VAL_Profile_WrongType = Specified profile type was "{0}", but found type "{1}"
 Validation_VAL_Unknown_Profile = Unknown profile {0}
-XHTML_XHTML_Attribute_Illegal = Illegal attribute name in the XHTML ('{0}' on '{1}')
-XHTML_XHTML_Element_Illegal = Illegal element name in the XHTML ('{0}')
-XHTML_XHTML_NS_InValid = Wrong namespace on the XHTML ('{0}', should be '{1}')
-XHTML_XHTML_Name_Invalid = Wrong name on the XHTML ('{0}') - must start with div
-_DT_Fixed_Wrong = Value is '{0}' but must be '{1}'
+XHTML_XHTML_Attribute_Illegal = Illegal attribute name in the XHTML ("{0}" on "{1}")
+XHTML_XHTML_Element_Illegal = Illegal element name in the XHTML ("{0}")
+XHTML_XHTML_NS_InValid = Wrong namespace on the XHTML ("{0}", should be "{1}")
+XHTML_XHTML_Name_Invalid = Wrong name on the XHTML ("{0}") - must start with div
+_DT_Fixed_Wrong = Value is "{0}" but must be "{1}"
 All_observations_should_have_an_effectiveDateTime_or_an_effectivePeriod = All observations should have an effectiveDateTime or an effectivePeriod
 All_observations_should_have_a_performer = All observations should have a performer
 All_observations_should_have_a_subject = All observations should have a subject
 Unable_to_resolve_slice_matching__no_fixed_value_or_required_value_set = Unable to resolve slice matching - no fixed value or required value set
 Unable_to_resolve_slice_matching__slice_matching_by_value_set_not_done = Unable to resolve slice matching - slice matching by value set not done
 Problem_processing_expression__in_profile__path__ = Problem processing expression {0} in profile {1} path {2}: {3}
-Unable_to_find_element_with_id_ = Unable to find element with id '{0}'
+Unable_to_find_element_with_id_ = Unable to find element with id "{0}"
 Slice_encountered_midway_through_set_path___id___ = Slice encountered midway through set (path = {0}, id = {1}); {2}
 Unable_to_resolve_actual_type_ = Unable to resolve actual type {0}
 Unsupported_version_R1 = Unsupported version R1
@@ -256,7 +256,7 @@ Unable_to_resolve_element__in_profile_ = Unable to resolve element {0} in profil
 Unable_to_resolve_profile_ = Unable to resolve profile {0}
 Resource_resolution_services_not_provided = Resource resolution services not provided
 Unrecognised_extension_context_ = Unrecognised extension context {0}
-Unable_to_locate_the_profile__in_order_to_validate_against_it = Unable to locate the profile '{0}' in order to validate against it
+Unable_to_locate_the_profile__in_order_to_validate_against_it = Unable to locate the profile "{0}" in order to validate against it
 Reference__refers_to_a__not_a_ValueSet = Reference {0} refers to a {1} not a ValueSet
 Not_done_yet_ValidatorHostServicesconformsToProfile_when_item_is_not_an_element = Not done yet (ValidatorHostServices.conformsToProfile), when item is not an element
 Not_supported_yet = Not supported yet