diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties b/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties
index c52895ea6..712386277 100644
--- a/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties
@@ -15,7 +15,8 @@ Bundle_BUNDLE_Entry_NotFound="{0}" konnte nicht in bundle ({1}) gefunden werden
 Bundle_BUNDLE_Entry_Orphan=Entry {0} ist nicht durch Traversierung, vom ersten Bundle-Entry ausgehend, erreichbar
 Bundle_BUNDLE_Entry_Type=Der type "{0}" ist nicht g\u00fcltig - hier sind keine Ressourcen erlaubt
 Bundle_BUNDLE_Entry_Type2=Der type "{0}" ist nicht g\u00fcltig - muss {1} sein
-Bundle_BUNDLE_Entry_Type3_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Bundle_BUNDLE_Entry_Type3_PLURAL_one=Der type "{1}" ist nicht g\u00fcltig - muss einer von {2} sein
 Bundle_BUNDLE_Entry_Type3_PLURAL_other=Der type "{1}" ist nicht g\u00fcltig - muss einer von {2} sein
 Bundle_BUNDLE_FullUrl_Missing=Es besteht eine relative Reference innerhalb des Bundle, dessen Eintrag eine fullUrl fehlt
 Bundle_BUNDLE_FullUrl_NeedVersion=Eintr\u00e4ge, die mit fullURL {0} \u00fcbereinstimmen, sollten meta/versionId deklarieren, da  versionsspezifische Referenzen vorhanden sind.
@@ -90,7 +91,7 @@ Questionnaire_QR_Item_NotEnabled2=Item besitzt eine answer, auch wenn es nicht a
 Questionnaire_QR_Item_NotFound=LinkId "{0}" im questionnaire nicht gefunden
 Questionnaire_QR_Item_OnlyOneA=Nur ein Antwortelement mit dieser LinkId zul\u00e4ssig
 #The following error cannot occur for a single item. _one case left intentionally blank.
-#Questionnaire_QR_Item_OnlyOneI_PLURAL_one=
+Questionnaire_QR_Item_OnlyOneI_PLURAL_one=
 Questionnaire_QR_Item_OnlyOneI_PLURAL_other=Nur ein Antwortelement mit dieser LinkId erlaubt - {1}
 Questionnaire_QR_Item_Order=Struktureller Fehler: Elemente in falscher Reihenfolge
 Questionnaire_QR_Item_StringNoOptions=String answer option kann nicht validiert werden, da keine Optionsliste bereitgestellt wird
@@ -211,15 +212,20 @@ Validation_BUNDLE_Message=Der erste Eintrag in einer Nachricht muss ein MessageH
 Validation_VAL_Content_Unknown=Unerkannter Inhalt {0}
 Validation_VAL_NoType=Unbekannter Typ {0}
 Validation_VAL_Profile_MatchMultiple=Profil {0}, Element stimmt mit mehr als einem Slice \u00fcberein - {1}, {2}
-Validation_VAL_Profile_Maximum_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Validation_VAL_Profile_Maximum_PLURAL_one={3}: maximal erlaubt = {7}, aber gefunden {0}
 Validation_VAL_Profile_Maximum_PLURAL_other={3}: maximal erlaubt = {7}, aber gefunden {0}
-Validation_VAL_Profile_Minimum_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Validation_VAL_Profile_Minimum_PLURAL_one={3}: mindestens erforderlich = {7}, aber nur gefunden {0}
 Validation_VAL_Profile_Minimum_PLURAL_other={3}: mindestens erforderlich = {7}, aber nur gefunden {0}
-Validation_VAL_Profile_MultipleMatches_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Validation_VAL_Profile_MultipleMatches_PLURAL_one=Es wurden mehrere passende Profile unter den Auswahlm\u00f6glichkeiten gefunden: {1}
 Validation_VAL_Profile_MultipleMatches_PLURAL_other=Es wurden mehrere passende Profile unter den Auswahlm\u00f6glichkeiten gefunden: {1}
-Validation_VAL_Profile_NoCheckMax_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Validation_VAL_Profile_NoCheckMax_PLURAL_one={1}: Kann die maximal zul\u00e4ssige Anzahl ({1}) aufgrund fehlender Slicing-Validierung nicht \u00fcberpr\u00fcfen.
 Validation_VAL_Profile_NoCheckMax_PLURAL_other={1}: Kann die maximal zul\u00e4ssige Anzahl ({1}) aufgrund fehlender Slicing-Validierung nicht \u00fcberpr\u00fcfen.
-Validation_VAL_Profile_NoCheckMin_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Validation_VAL_Profile_NoCheckMin_PLURAL_one={1}: Kann das erforderliche Minimum ({1}) aufgrund fehlender Slicing-Validierung nicht \u00fcberpr\u00fcfen
 Validation_VAL_Profile_NoCheckMin_PLURAL_other={1}: Kann das erforderliche Minimum ({1}) aufgrund fehlender Slicing-Validierung nicht \u00fcberpr\u00fcfen
 Validation_VAL_Profile_NoDefinition=Keine Definition f\u00fcr Ressourcentyp "{0}" gefunden
 Validation_VAL_Profile_NoMatch=Es ist nicht m\u00f6glich, ein passendes Profil unter den Kandidaten zu finden: {0}
@@ -428,7 +434,8 @@ Version_mismatch_The_context_has_version__loaded_and_the_new_content_being_loade
 Error_reading__from_package__=Fehler beim Lesen {0} aus dem Paket {1}#{2}: {3}
 Error_parsing_=Fehler beim Parsen {0}:{1}
 Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_using_terminology_services_to_validate_LOINC_SNOMED_ICDX_etc_Error__=Keine Verbindung zum Terminologieserver m\u00f6glich. Verwenden Sie den Parameter ''-tx n/a'' um ohne Verwendung von Terminologiediensten zu laufen welche LOINC, SNOMED, ICD-X usw. zu validieren. Fehler = {0}
-Display_Name_for__should_be_one_of__instead_of_PLURAL_one=REPARIERE MICH
+#REPARIERE MICH PLURAL
+Display_Name_for__should_be_one_of__instead_of_PLURAL_one=Der Displayname f\u00fcr {1}#{2} sollte einer von ''{3}'' anstelle von ''{4}'' sein.
 Display_Name_for__should_be_one_of__instead_of_PLURAL_other=Der Displayname f\u00fcr {1}#{2} sollte einer von ''{3}'' anstelle von ''{4}'' sein.
 Unknown_Code__in_=Unbekannter Code {0} in {1}
 Code_found_in_expansion_however_=Code in der Erweiterung gefunden, jedoch: {0}
@@ -445,33 +452,43 @@ Unable_to_resolve_system__no_value_set=System nicht aufl\u00f6sbar - kein ValueS
 This_base_property_must_be_an_Array_not_a_=Diese Basis Property muss ein Array sein, nicht ein {0}
 This_property_must_be_an_Array_not_a_=Diese Eigenschaft muss ein Array sein, nicht ein {0}
 documentmsg = (document)
-XHTML_URL_INVALID_CHARS_PLURAL_one = REPARIERE MICH
-XHTML_URL_INVALID_CHARS_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#XHTML_URL_INVALID_CHARS_PLURAL_one =
+#XHTML_URL_INVALID_CHARS_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-#BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_PLURAL_one = REPARIERE MICH
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_PLURAL_one =
+#BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_LEFT_VALUE_PLURAL_one =
-FHIRPATH_LEFT_VALUE_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_LEFT_VALUE_PLURAL_one =
+#FHIRPATH_LEFT_VALUE_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_RIGHT_VALUE_PLURAL_one =
-FHIRPATH_RIGHT_VALUE_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_RIGHT_VALUE_PLURAL_one =
+#FHIRPATH_RIGHT_VALUE_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES_PLURAL_one =
-FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES_PLURAL_one =
+#FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET_PLURAL_one =
-FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET_PLURAL_one =
+#FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES_PLURAL_one =
-FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES_PLURAL_one =
+#FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES_PLURAL_one =
-FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES_PLURAL_one =
+#FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_FOCUS_PLURAL_one =
-FHIRPATH_FOCUS_PLURAL_other = REPARIERE MICH
+#REPARIERE MICH PLURAL
+#FHIRPATH_FOCUS_PLURAL_one =
+#FHIRPATH_FOCUS_PLURAL_other =
 #The following error cannot occur for a single item. _one case left intentionally blank.
-MULTIPLE_LOGICAL_MODELS_PLURAL_one=
-MULTIPLE_LOGICAL_MODELS_PLURAL_other= REPARIERE MICH
+#REPARIERE MICH PLURAL
+#MULTIPLE_LOGICAL_MODELS_PLURAL_one=
+#MULTIPLE_LOGICAL_MODELS_PLURAL_other=
 
diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages_nl.properties b/org.hl7.fhir.utilities/src/main/resources/Messages_nl.properties
index e9b5ab9ed..b87820965 100644
--- a/org.hl7.fhir.utilities/src/main/resources/Messages_nl.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/Messages_nl.properties
@@ -13,7 +13,8 @@ Bundle_BUNDLE_Entry_NotFound = Kan ''{0}'' niet vinden in de bundle ({1})
 Bundle_BUNDLE_Entry_Orphan = Entry {0} is niet bereikbaar via een referentie vanuit de eerste Bundle entry
 Bundle_BUNDLE_Entry_Type = Het type ''{0}'' is niet geldig - hier zijn resources toegestaan (toegestaan = {1})
 Bundle_BUNDLE_Entry_Type2 = Het type ''{0}'' is niet geldig - moet zijn {1} (toegestaan = {2})
-Bundle_BUNDLE_Entry_Type3_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+Bundle_BUNDLE_Entry_Type3_PLURAL_one = The type ''{1}'' is niet geldig - moet een zijn van {2}
 Bundle_BUNDLE_Entry_Type3_PLURAL_other = The type ''{1}'' is niet geldig - moet een zijn van {2}
 Bundle_BUNDLE_FullUrl_Missing = Relatieve reference in Bundle waarvan de entry een fullUrl mist
 Bundle_BUNDLE_FullUrl_NeedVersion = Entries die overeenkomen met fullURL {0} moeten meta/versionId bevatten omdat er versie-specifieke references zijn
@@ -91,7 +92,7 @@ Questionnaire_QR_Item_NotEnabled2 = Item heeft een antwoord, terwijl deze niet a
 Questionnaire_QR_Item_NotFound = LinkId ''{0}'' niet gevonden in questionnaire
 Questionnaire_QR_Item_OnlyOneA = Er is slechts een antwoorditem toegestaan bij dit linkId
 #The following error cannot occur for a single item. _one case left intentionally blank.
-#Questionnaire_QR_Item_OnlyOneI_PLURAL_one =
+Questionnaire_QR_Item_OnlyOneI_PLURAL_one =
 Questionnaire_QR_Item_OnlyOneI_PLURAL_other = Er is slechts een item toegestaan bij dit linkId - {1}
 Questionnaire_QR_Item_Order = Structuurfout: items staan niet in de juiste volgorde
 Questionnaire_QR_Item_StringNoOptions = Kan string-antwoord niet valideren omdat er geen optielijst is gespecificeerd
@@ -216,15 +217,20 @@ Validation_VAL_Content_Unknown = Niet-herkende content {0}
 Validation_VAL_NoType = Onbekend type {0}
 Validation_VAL_Profile_MatchMultiple = Profiel {0}, element komt overeen met meer dan een slice - {1}, {2}
 # for the next 4 messages, the available parameters are: 0: profile url, 1: ed.path, 2: ed.id, 3: ed.sliceName, 4: ed.label, 5: element.path, 6: ed.min and optionally 7: actual count
+#REPAREER MIJ PLURAL
 Validation_VAL_Profile_Maximum_PLURAL_one = {3}: max toegestaan = {7}, maar gevonden {0} (uit {1})
 Validation_VAL_Profile_Maximum_PLURAL_other = {3}: max toegestaan = {7}, maar gevonden {0} (uit {1})
+#REPAREER MIJ PLURAL
 Validation_VAL_Profile_Minimum_PLURAL_one = {3}: minimum vereist = {7}, maar gevonden {0} (uit {1})
 Validation_VAL_Profile_Minimum_PLURAL_other = {3}: minimum vereist = {7}, maar gevonden {0} (uit {1})
-Validation_VAL_Profile_NoCheckMax_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+Validation_VAL_Profile_NoCheckMax_PLURAL_one = {3}: Kan max toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
 Validation_VAL_Profile_NoCheckMax_PLURAL_other = {3}: Kan max toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
-Validation_VAL_Profile_NoCheckMin_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+Validation_VAL_Profile_NoCheckMin_PLURAL_one = {3}: Kan min toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
 Validation_VAL_Profile_NoCheckMin_PLURAL_other = {3}: Kan min toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
-Validation_VAL_Profile_MultipleMatches_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+Validation_VAL_Profile_MultipleMatches_PLURAL_one = Meerdere overeenkomende profielen gevonden in de opties: {1}
 Validation_VAL_Profile_MultipleMatches_PLURAL_other = Meerdere overeenkomende profielen gevonden in de opties: {1}
 Validation_VAL_Profile_NoDefinition = Geen definitie gevonden voor resourcetype ''{0}''
 Validation_VAL_Profile_NoMatch = Kan geen overeenkomstig profiel vinden in de opties: {0}
@@ -269,12 +275,12 @@ Could_not_match_discriminator_for_slice_in_profile_PLURAL_other = Kan geen overe
 Discriminator__is_based_on_element_existence_but_slice__neither_sets_min1_or_max0 = Discriminator ({0}) is gebaseerd op elementaanwezigheid, maar slice {1} heeft geen min>=1 of max=0
 Profile_based_discriminators_must_have_a_type_with_a_profile__in_profile_ = Profiel-gebaseerde discriminators moeten een type hebben met een profiel ({0} in profiel {1})
 #The following error cannot occur for a single item. _one case left intentionally blank.
-#Profile_based_discriminators_must_have_only_one_type__in_profile_PLURAL_one =
+Profile_based_discriminators_must_have_only_one_type__in_profile_PLURAL_one =
 Profile_based_discriminators_must_have_only_one_type__in_profile_PLURAL_other = Profiel-gebaseerde discriminators moeten slechts een type bevatten ({1} in profile {2})
 Profile_based_discriminators_must_have_a_type__in_profile_ = Profiel-gebaseerde discriminators moeten een type hebben ({0} in profile {1})
 Discriminator__is_based_on_type_but_slice__in__has_no_types = Discriminator ({0}) is gebaseerd op type, maar slice {1} in {2} heeft geen typen
 #The following error cannot occur for a single item. _one case left intentionally blank.
-#Discriminator__is_based_on_type_but_slice__in__has_multiple_types_PLURAL_one =
+Discriminator__is_based_on_type_but_slice__in__has_multiple_types_PLURAL_one =
 Discriminator__is_based_on_type_but_slice__in__has_multiple_types_PLURAL_other = Discriminator ({1}) is gebaseerd op type, maar slice {2} in {3} heeft meerdere typen: {4}
 Found__items_for__resolving_discriminator__from_ = {0} items gevonden voor {1} bij controle van discriminator {2} van {3}
 Unable_to_find__resolving_discriminator__from_ = Kan {0} niet vinden bij controle van discriminator {1} van {2}
@@ -439,7 +445,8 @@ Version_mismatch_The_context_has_version__loaded_and_the_new_content_being_loade
 Error_reading__from_package__ = Fout bij lezen {0} uit package {1}#{2}: {3}
 Error_parsing_ = Fout bij verwerken {0}:{1}
 Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_using_terminology_services_to_validate_LOINC_SNOMED_ICDX_etc_Error__ = Kan niet verbinden met terminologieserver. Gebruik parameter ''-tx n/a'' om te starten zonder terminologieservices voor validatie van LOINC, SNOMED, ICD-X etc. Fout = {0}
-Display_Name_for__should_be_one_of__instead_of_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+Display_Name_for__should_be_one_of__instead_of_PLURAL_one = Weergavenaam voor {1}#{2} zou een van ''{3}'' moeten zijn in plaats van ''{4}''
 Display_Name_for__should_be_one_of__instead_of_PLURAL_other = Weergavenaam voor {1}#{2} zou een van ''{3}'' moeten zijn in plaats van ''{4}''
 Unknown_Code__in_ = Onbekende code {0} in {1}
 UNKNOWN_CODE__IN_FRAGMENT = Onbekende code {0} in {1} - merk op dat het codesysteem is gemarkeerd als fragment, waardoor mogelijk geldig is in een ander fragment
@@ -504,7 +511,8 @@ MEASURE_M_CRITERIA_CQL_NO_ELM = Fout in {0}: Geen gecompileerde versie van CQL g
 MEASURE_M_CRITERIA_CQL_ELM_NOT_VALID = = Fout in {0}: Gecompileerde versie van CQL is niet geldig
 MEASURE_M_CRITERIA_CQL_NOT_FOUND = De functie {1} bestaat niet in de bibliotheek {0}
 XHTML_URL_EMPTY = URL is leeg
-XHTML_URL_INVALID_CHARS_PLURAL_one = REPAREER MIJ
+#REPAREER MIJ PLURAL
+XHTML_URL_INVALID_CHARS_PLURAL_one = URL bevat ongeldige tekens ({1})
 XHTML_URL_INVALID_CHARS_PLURAL_other = URL bevat ongeldige tekens ({1})
 TERMINOLOGY_TX_SYSTEM_HTTPS = De system URL ''{0}'' begint onterecht met https: in plaats van http:
 CODESYSTEM_CS_NO_VS_NOTCOMPLETE = Review de ''alle codes'' ValueSet - incomplete CodeSystems moeten generiek geen waardelijst voor ''alle codes'' specificeren
@@ -637,7 +645,7 @@ FHIRPATH_BAD_DATE = Kan Date {0} niet verwerken
 FHIRPATH_NUMERICAL_ONLY = Fout bij evalueren FHIRPath expressie: De functie {0} kan alleen worden gebruikt met integer, decimal of Quantity maar gevonden {1}
 FHIRPATH_DECIMAL_ONLY = Fout bij evalueren FHIRPath expressie: De functie {0} kan alleen worden gebruikt met decimal maar gevonden {1}
 #The following error cannot occur for a single item. _one case left intentionally blank.
-FHIRPATH_FOCUS_PLURAL_one =
+#FHIRPATH_FOCUS_PLURAL_one =
 FHIRPATH_FOCUS_PLURAL_other = Fout bij evalueren FHIRPath expressie: focus voor {1} heeft meer dan een waarde
 REFERENCE_REF_SUSPICIOUS = De syntax van de reference ''{0}'' oogt incorrect en moeten worden gecontroleerd
 TYPE_SPECIFIC_CHECKS_DT_QTY_NO_ANNOTATIONS = UCUM-codes met menselijk leesbare annotaties zoals {0} kunnen misleidend zijn. Aanbevolen is om geen annotaties in de UCUM-code te gebruiken en in plaats daarvan te zorgen dat Quantity.unit goed leesbaar is 
@@ -685,5 +693,6 @@ BUNDLE_SEARCH_ENTRY_WRONG_RESOURCE_TYPE_NO_MODE = Dit is geen overeenkomstig res
 BUNDLE_SEARCH_NO_MODE = SearchSet bundles zouden search.mode op de entries moeten hebben
 INV_FAILED = Regel {0} mislukt
 #The following error cannot occur for a single item. _one case left intentionally blank.
-MULTIPLE_LOGICAL_MODELS_PLURAL_one=
-MULTIPLE_LOGICAL_MODELS_PLURAL_other= REPAREER MIJ
+#REPAREER MIJ PLURAL
+#MULTIPLE_LOGICAL_MODELS_PLURAL_one=
+#MULTIPLE_LOGICAL_MODELS_PLURAL_other=