Merge branch 'hapifhir:master' into master

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/LanguageUtils.java

@@ -285,7 +285,8 @@ public class LanguageUtils {
     if (element.isPrimitive() && isTranslatable(element)) {
       String base = element.primitiveValue();
       if (base != null) {
-        Set<TranslationUnit> tlist = findTranslations(pathForElement(element), base, translations);
+        String path = pathForElement(element);
+        Set<TranslationUnit> tlist = findTranslations(path, base, translations);
         for (TranslationUnit translation : tlist) {
           t++;
           if (!handleAsSpecial(parent, element, translation)) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/LiquidRenderer.java

@@ -144,8 +144,13 @@ public class LiquidRenderer extends ResourceRenderer implements ILiquidRendering
       } else {
         x.tx(base.toString());
       }
-      String res = new XhtmlComposer(true).compose(x).substring(5);
+      String res = new XhtmlComposer(true).compose(x);
-      return res.substring(0, res.length()-6);
+      res = res.substring(5);
+      if (res.length() < 6) {
+        return "";
+      } else {
+        return res.substring(0, res.length()-6);
+      }
     } catch (FHIRFormatError e) {
       throw new FHIRException(e);
     } catch (IOException e) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java

@@ -216,9 +216,9 @@ public class ValueSetRenderer extends TerminologyRenderer {
       if (vs.getExpansion().hasTotal()) {
         if (count != vs.getExpansion().getTotal()) {
           x.para().style("border: maroon 1px solid; background-color: #FFCCCC; font-weight: bold; padding: 8px")
-            .addText(context.formatPhrase(RenderingContext.VALUE_SET_HAS)+(hasFragment ? context.formatPhrase(RenderingContext.VALUE_SET_AT_LEAST) : "")+vs.getExpansion().getTotal()+" codes in it. In order to keep the publication size manageable, only a selection ("+count+" codes) of the whole set of codes is shown.");
+            .addText(context.formatPhrase(hasFragment ? RenderingContext.VALUE_SET_HAS_AT_LEAST : RenderingContext.VALUE_SET_HAS, vs.getExpansion().getTotal()));
         } else {
-          x.para().tx(context.formatPhrase(RenderingContext.VALUE_SET_CONTAINS)+(hasFragment ? context.formatPhrase(RenderingContext.VALUE_SET_AT_LEAST) : "")+vs.getExpansion().getTotal()+" concepts.");          
+          x.para().tx(context.formatPhrase(hasFragment ? RenderingContext.VALUE_SET_CONTAINS_AT_LEAST : RenderingContext.VALUE_SET_CONTAINS, vs.getExpansion().getTotal()));          
         }
       } else if (count == 1000) {
         // it's possible that there's exactly 1000 codes, in which case wht we're about to do is wrong

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java

@@ -231,9 +231,11 @@ public class LiquidEngine implements IEvaluationContext {
       StringBuilder b = new StringBuilder();
       boolean first = true;
       for (Base i : items) {
-        if (first) first = false; else b.append(", ");
+        if (i != null) {
-        String s = renderingSupport != null ? renderingSupport.renderForLiquid(ctxt.externalContext, i) : null;
+          if (first) first = false; else b.append(", ");
-        b.append(s != null ? s : engine.convertToString(i));
+          String s = renderingSupport != null ? renderingSupport.renderForLiquid(ctxt.externalContext, i) : null;
+          b.append(s != null ? s : engine.convertToString(i));
+        }
       }
       return b.toString();
     }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/sql/Runner.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.net.util.Base64;
+import org.apache.commons.codec.binary.Base64;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.exceptions.PathEngineException;
 import org.hl7.fhir.r5.context.IWorkerContext;

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/TextFile.java

@@ -51,6 +51,7 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import org.hl7.fhir.utilities.filesystem.CSFile;
 import org.hl7.fhir.utilities.filesystem.ManagedFileAccess;
@@ -202,4 +203,9 @@ public class TextFile {
   public static void streamToFileNoClose(final InputStream stream, final String filename) throws IOException {
     Files.copy(stream, Path.of(filename), StandardCopyOption.REPLACE_EXISTING);
   }
+
+  public static String[] fileToLines(String file) throws FileNotFoundException, IOException {
+    Pattern LINE_SEP_PATTERN = Pattern.compile("\\R");
+    return LINE_SEP_PATTERN.split(fileToString(file));
+  }
 }

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java

@@ -1,129 +1,318 @@
 package org.hl7.fhir.utilities.i18n;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
-import java.util.HashSet;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
+import org.hl7.fhir.utilities.StringPair;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.filesystem.ManagedFileAccess;
 
 public class POGenerator {
 
-  public static void main(String[] args) throws IOException {
+  public class POObjectSorter implements Comparator<POObject> {
-//    if (true) {
+
-//      throw new Error("This needs to be rewritten for using existing .po files");
+    @Override
-//    }
+    public int compare(POObject o1, POObject o2) {
-    new POGenerator().execute(args[0], Integer.valueOf(args[1]), args[2], args[3], args[4], args.length == 6 ? args[5] : null);
+      return o1.id.compareTo(o2.id);
+    }
+
   }
 
-  private void execute(String lang, int count, String dest, String source, String current, String altVersion) throws IOException {
+  private class POObject {
-    File dst = ManagedFileAccess.file(dest);
+    private String id;
-    if (dst.exists()) {
+    private String msgid;
-      dst.delete();
+    private String oldMsgId;
+    private String msgidPlural;
+    private List<String> msgstr  = new ArrayList<String>();
+  }
+
+  public static void main(String[] args) throws IOException {
+    new POGenerator().execute(args[0], args[1]);
+  }
+
+  private List<String> prefixes = new ArrayList<>();
+
+  private void execute(String source, String dest) throws IOException {
+    generate(Utilities.path(source, "rendering-phrases.properties"), Utilities.path(dest, "rendering-phrases-de.po"));
+    generate(Utilities.path(source, "rendering-phrases.properties"), Utilities.path(dest, "rendering-phrases-es.po"));
+    generate(Utilities.path(source, "rendering-phrases.properties"), Utilities.path(dest, "rendering-phrases-ja.po"));
+    generate(Utilities.path(source, "rendering-phrases.properties"), Utilities.path(dest, "rendering-phrases-nl.po"));
+
+    generate(Utilities.path(source, "Messages.properties"), Utilities.path(dest, "validator-messages-de.po"));
+    generate(Utilities.path(source, "Messages.properties"), Utilities.path(dest, "validator-messages-es.po"));
+    generate(Utilities.path(source, "Messages.properties"), Utilities.path(dest, "validator-messages-ja.po"));
+    generate(Utilities.path(source, "Messages.properties"), Utilities.path(dest, "validator-messages-nl.po"));
+  }
+
+  private void generate(String source, String dest) throws IOException {
+    // load the destination file 
+    // load the source file 
+    // update the destination object set for changes from the source file
+    // save the destination file 
+    List<POObject> objects = loadPOFile(dest);
+    List<StringPair> props = loadProperties(source);
+    for (StringPair e : props) {
+      String name = e.getName();
+      int mode = 0;
+      if (name.endsWith("_one")) {
+        mode = 1;
+        name = name.substring(0, name.length() - 4);
+      } else if (name.endsWith("_other")) {
+        mode = 2;
+        name = name.substring(0, name.length() - 6);
+      } 
+
+      POObject o = findObject(objects, name);
+      if (o == null) {
+        if (mode > 1) {
+          throw new Error("Not right");
+        }
+        o = new POObject();
+        o.id = name;
+        objects.add(o);
+        o.msgid = e.getValue();
+      } else {
+        update(o, mode, e.getValue());
+      }
     }
-    Map<String, String> props = loadProperties(source);
+    Collections.sort(objects, new POObjectSorter());
-    Map<String, String> curr = loadProperties(current);
+    savePOFile(dest, objects);
-    Map<String, String> past = loadProperties(altVersion);
+
+    //    File dst = ManagedFileAccess.file(dest);
+    //    if (dst.exists()) {
+    //      dst.delete();
+    //    }
+    //    Map<String, String> props = loadProperties(source);
+    //    Map<String, String> curr = loadProperties(current);
+    //    Map<String, String> past = loadProperties(altVersion);
+    //    
+    //    StringBuilder b = new StringBuilder();
+    //    b.append("en -> "+lang+"\r\n");
+    //
+    //    Set<String> plurals = new HashSet<>();
+    //    
+    //    for (String n : Utilities.sorted(curr.keySet())) {
+    //      if (n.endsWith("_one") || n.endsWith("_other") || n.endsWith("_many")) {
+    //        if (n.endsWith("_one")) {
+    //          n = n.substring(0, n.length() - 4);
+    //        } else if (n.endsWith("_other")) {
+    //          n = n.substring(0, n.length() - 6);
+    //        } else if (n.endsWith("_many")) {
+    //          n = n.substring(0, n.length() - 5);
+    //        }
+    //        if (!plurals.contains(n)) {
+    //          plurals.add(n);
+    //          b.append("\r\n");
+    //          String v1 = curr.get(n+"_one");
+    //          String vO = curr.get(n+"_other");
+    //          List<String> ll = new ArrayList<>();
+    //          addToList(ll, props, n+"_one");
+    //          addToList(ll, props, n+"_other");
+    //          addToList(ll, props, n+"_many");
+    //          String p1 = past == null ? null : past.get(n+"_one");
+    //          String pO = past == null ? null : past.get(n+"_other");
+    //          boolean changed = false;
+    //          if (ll.size() > 0 && p1 != null) {
+    //            if (!p1.equals(v1)) {
+    //              changed = true;
+    //              ll.set(0,  "!!"+ll.get(0));
+    //            }
+    //          }        
+    //          if (ll.size() > 1 && pO != null) {
+    //            if (!pO.equals(vO)) {
+    //              changed = true;
+    //              ll.set(1,  "!!"+ll.get(1));
+    //              if (ll.size() == 3) {
+    //                ll.set(2,  "!!"+ll.get(2));                
+    //              }
+    //            }
+    //          }        
+    //          b.append("#: "+n+"\r\n");
+    //          if (changed) {
+    //            b.append("#| one "+p1+"\r\n");
+    //            b.append("#| plural "+pO+"\r\n");
+    //          }
+    //          b.append("msgid \""+v1+"\"\r\n");
+    //          b.append("msgid_plural \""+vO+"\"\r\n");
+    //          for (int i = 0; i < count; i++) {
+    //            b.append("msgstr["+i+"] \""+(i < ll.size() ? ll.get(i) : "")+"\"\r\n");
+    //          }
+    //        }
+    //      } else {
+    //        b.append("\r\n");
+    //        String v = curr.get(n);
+    //        String l = props.get(n);
+    //        String p = past == null ? null : past.get(n);
+    //        boolean changed = false;
+    //        if (l != null && p != null) {
+    //          if (!p.equals(v)) {
+    //            changed = true;
+    //            l = "!!"+l;
+    //          }
+    //        }        
+    //        b.append("#: "+n+"\r\n");
+    //        if (changed) {
+    //          b.append("#| "+p+"\r\n");
+    //        }
+    //        b.append("msgid \""+v+"\"\r\n");
+    //        b.append("msgstr \""+(l == null ? "" : l)+"\"\r\n");
+    //      }
+    //    }
+    //    TextFile.stringToFile(b.toString(), dst);
+  }
+
+  private void savePOFile(String dest, List<POObject> objects) throws IOException {
+    prefixes.clear();
     
     StringBuilder b = new StringBuilder();
-    b.append("en -> "+lang+"\r\n");
+    for (String p : prefixes) {
-
+      b.append(p);
-    Set<String> plurals = new HashSet<>();
+      b.append("\r\n");
-    
+    }
-    for (String n : Utilities.sorted(curr.keySet())) {
+    b.append("\r\n");
-      if (n.endsWith("_one") || n.endsWith("_other") || n.endsWith("_many")) {
+    for (POObject o : objects) {
-        if (n.endsWith("_one")) {
+      b.append("#: "+o.id+"\r\n");
-          n = n.substring(0, n.length() - 4);
+      if (o.oldMsgId != null) {
-        } else if (n.endsWith("_other")) {
+        b.append("#| "+o.oldMsgId+"\r\n");        
-          n = n.substring(0, n.length() - 6);
+      }
-        } else if (n.endsWith("_many")) {
+      b.append("msgid \""+o.msgid+"\"\r\n");
-          n = n.substring(0, n.length() - 5);
+      if (o.msgidPlural != null) {
+        b.append("msgid_plural \""+o.msgidPlural+"\"\r\n"); 
+        for (int i = 0; i < o.msgstr.size(); i++) {
+          b.append("msgstr["+i+"] \""+o.msgstr.get(i)+"\"\r\n");
         }
-        if (!plurals.contains(n)) {
+      } else {
-          plurals.add(n);
+        if (o.msgstr.size() == 0) {
-          b.append("\r\n");
+          b.append("msgstr \"\"\r\n");                  
-          String v1 = curr.get(n+"_one");
+        } else {
-          String vO = curr.get(n+"_other");
+          b.append("msgstr \""+o.msgstr.get(0)+"\"\r\n");                            
-          List<String> ll = new ArrayList<>();
+        }
-          addToList(ll, props, n+"_one");
+      } 
-          addToList(ll, props, n+"_other");
+      b.append("\r\n");
-          addToList(ll, props, n+"_many");
+    }
-          String p1 = past == null ? null : past.get(n+"_one");
+    TextFile.stringToFile(b.toString(), dest);
-          String pO = past == null ? null : past.get(n+"_other");
+  }
-          boolean changed = false;
+
-          if (ll.size() > 0 && p1 != null) {
+  private void update(POObject o, int mode, String value) {
-            if (!p1.equals(v1)) {
+    if (mode == 0) {
-              changed = true;
+      if (!value.equals(o.msgid)) {
-              ll.set(0,  "!!"+ll.get(0));
+        // the english string has changed, and the other language string is now out of date
-            }
+        if (o.oldMsgId != null && !o.msgstr.isEmpty()) {
-          }        
+          o.oldMsgId = o.msgid;
-          if (ll.size() > 1 && pO != null) {
+        }
-            if (!pO.equals(vO)) {
+        o.msgid = value;
-              changed = true;
+        for (int i = 0; i < o.msgstr.size(); i++) {
-              ll.set(1,  "!!"+ll.get(1));
+          if (!Utilities.noString(o.msgstr.get(i))) {
-              if (ll.size() == 3) {
+            o.msgstr.set(i, "!!"+o.msgstr.get(i));
-                ll.set(2,  "!!"+ll.get(2));                
-              }
-            }
-          }        
-          b.append("#: "+n+"\r\n");
-          if (changed) {
-            b.append("#| one "+p1+"\r\n");
-            b.append("#| plural "+pO+"\r\n");
-          }
-          b.append("msgid \""+v1+"\"\r\n");
-          b.append("msgid_plural \""+vO+"\"\r\n");
-          for (int i = 0; i < count; i++) {
-            b.append("msgstr["+i+"] \""+(i < ll.size() ? ll.get(i) : "")+"\"\r\n");
           }
         }
       } else {
-        b.append("\r\n");
+        // we don't care; nothing to do 
-        String v = curr.get(n);
+      }
-        String l = props.get(n);
+    } else if (mode == 1) {
-        String p = past == null ? null : past.get(n);
+      if (!value.equals(o.msgid)) {
-        boolean changed = false;
+        // the english string has changed, and the other language string is now out of date 
-        if (l != null && p != null) {
+        if (o.oldMsgId != null && !o.msgstr.isEmpty()) {
-          if (!p.equals(v)) {
+          o.oldMsgId = o.msgid;
-            changed = true;
-            l = "!!"+l;
-          }
         }
-        b.append("#: "+n+"\r\n");
+        o.msgid = value;
-        if (changed) {
+        if (o.msgstr.size() > 0 && !Utilities.noString(o.msgstr.get(0))) {
-          b.append("#| "+p+"\r\n");
+          o.msgstr.set(0, "!!"+o.msgstr.get(0));
         }
-        b.append("msgid \""+v+"\"\r\n");
+      } else {
-        b.append("msgstr \""+(l == null ? "" : l)+"\"\r\n");
+        // we don't care; nothing to do 
+      }
+    } else if (mode == 2) {
+      if (!value.equals(o.msgid)) {
+        // the english string has changed, and the other language string is now out of date 
+//        if (o.oldMsgId != null) {
+//          o.oldMsgId = o.msgid;
+//        }
+        o.msgid = value;
+        if (o.msgstr.size() > 1 && !Utilities.noString(o.msgstr.get(1))) {
+          o.msgstr.set(1, "!!"+o.msgstr.get(1));
+        }
+      } else {
+        // we don't care; nothing to do 
       }
     }
-    TextFile.stringToFile(b.toString(), dst);
   }
 
-  private void addToList(List<String> l, Map<String, String> props, String string) {
+  private POObject findObject(List<POObject> objects, String name) {
-    // TODO Auto-generated method stub
+    for (POObject t : objects) {
-    
+      if (t.id.equals(name)) {
-  }
+        return t;
-
+      }
-  private Map<String, String> loadProperties(String source) throws IOException {
-    if (source == null) {
-      return null;
     }
-    Map<String, String> res = new HashMap<>();
+    return null;
+  }
+
+  private List<POObject> loadPOFile(String dest) throws FileNotFoundException, IOException {
+    List<POObject> list = new ArrayList<POGenerator.POObject>();
+    POObject obj = null;
+    for (String line : TextFile.fileToLines(dest)) {
+      if (Utilities.noString(line)) {
+        // else 
+      } else if (line.startsWith("#:")) {
+        obj = new POObject();
+        obj.id = line.substring(2).trim();
+        list.add(obj);
+      } else if (obj == null) {
+        prefixes.add(line);  
+      } else if (line.startsWith("#|")) {
+        obj.oldMsgId = line.substring(2).trim();
+      } else if (line.startsWith("msgid ")) {
+        obj.msgid = trimQuotes(line.substring(5).trim());
+      } else if (line.startsWith("msgid_plural ")) {
+        obj.msgidPlural = trimQuotes(line.substring(12).trim());
+      } else if (line.startsWith("msgstr ")) {
+        obj.msgstr.add(trimQuotes(line.substring(6).trim()));
+      } else if (line.startsWith("msgstr[")) {
+        String s = line.substring(7);
+        int i = s.indexOf("]");
+        int c = Integer.valueOf(s.substring(0, i));
+        s = trimQuotes(s.substring(i+1).trim());
+        if (s.startsWith("!!")) {
+          s = s.substring(2);
+        }
+        if (c != obj.msgstr.size()) {
+          System.out.println("index issue");   
+        } else { // if (!Utilities.noString(s)) {
+          obj.msgstr.add(s);          
+        }
+      } else {
+        System.out.println("unknown line: "+line);          
+      }
+    }
+    return list;
+  }
+
+  private String trimQuotes(String s) {
+    if (s.startsWith("\"")) {
+      s = s.substring(1);
+    }
+    if (s.endsWith("\"")) {
+      s = s.substring(0, s.length()-1);
+    }
+    return s.trim();
+  }
+
+  private List<StringPair> loadProperties(String source) throws IOException {
+    List<StringPair> res = new ArrayList<>();
     File src = ManagedFileAccess.file(source);
     List<String> lines = Files.readAllLines(src.toPath());
     for (String line : lines) {
       if (!line.startsWith("#") && line.contains("=")) {
         String n = line.substring(0, line.indexOf("=")).trim();
         String v = line.substring(line.indexOf("=")+1).trim();
-        res.put(n,  v);
+        res.add(new StringPair(n, v));
       }
     }
     return res;

org.hl7.fhir.utilities/src/main/resources/source/validator-messages-de.po

@@ -1,6 +1,3 @@
-// en -> de
-Plural-Forms: nplurals=2; plural=n != 1;
-
 
 #: ABSTRACT_CODE_NOT_ALLOWED
 msgid "Code ''{0}#{1}'' is abstract, and not allowed in this context"
@@ -61,6 +58,14 @@ msgstr "Versuch den Terminologieserver zu verwenden, wenn kein Terminologieserve
 msgid "Attempt to use a snapshot on profile ''{0}'' as {1} before it is generated"
 msgstr "Versuch einen Schnappschuss f\u00fcr das Profil ''{0}'' als {1} zu verwenden, bevor er generiert wird"
 
+#: BINDING_ADDITIONAL
+msgid "{0} specified in an additional binding"
+msgstr ""
+
+#: BINDING_MAX
+msgid "{0} specified in the max binding"
+msgstr ""
+
 #: BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE
 msgid "Found {0} matches for ''{1}'' in the bundle ({2})"
 msgstr ""
@@ -86,7 +91,7 @@ msgid "The {1} resource did not math the profile {2} because: {3}"
 msgstr ""
 
 #: BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT
-msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there is a resource in the bundle with the same type and id, but it does not match because of the fullUrl based rules around matching relative references (must be ``{3}``)"
+msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgid_plural "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgstr[0] ""
 msgstr[1] ""
@@ -284,7 +289,7 @@ msgid "The type ''{0}'' is not valid - must be {1} (allowed = {2})"
 msgstr "Der type ''{0}'' ist nicht g\u00fcltig - muss {1} sein"
 
 #: Bundle_BUNDLE_Entry_Type3
-msgid "The type ''{1}'' is not valid - must be of type {2}"
+msgid "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgid_plural "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -447,7 +452,7 @@ msgid "This property has only the standard code (''{0}'') but not the standard U
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_NO_VALUE
-msgid "The property ''{0}'' has no value, and cannot be understoof"
+msgid "The property ''{0}'' has no value, and cannot be understood"
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_SYNONYM_CHECK
@@ -673,7 +678,7 @@ msgid "Contained resource does not appear to be a FHIR resource (unknown name ''
 msgstr "Enthaltene Ressource scheint keine FHIR-Ressource zu sein (unbekannter Name ''{0}'')"
 
 #: Could_not_match_discriminator_for_slice_in_profile
-msgid "Could not match discriminator ({0}) for slice {1} in profile {2} - the discriminator {3} does not have fixed value, binding or existence assertions"
+msgid "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgid_plural "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgstr[0] ""
 msgstr[1] ""
@@ -735,7 +740,7 @@ msgid "Discriminator ({0}) is based on element existence, but slice {1} neither
 msgstr "Der Diskriminator ({0}) basiert auf der Existenz von Elementen, aber Slice {1} setzt weder min>=1 noch max=0"
 
 #: Discriminator__is_based_on_type_but_slice__in__has_multiple_types
-msgid ""
+msgid "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgid_plural "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -745,13 +750,13 @@ msgid "Discriminator ({0}) is based on type, but slice {1} in {2} has no types"
 msgstr "Der Diskriminator ({0}) basiert auf dem Typ, aber das Slice {1} in {2} hat keine Typen"
 
 #: Display_Name_WS_for__should_be_one_of__instead_of
-msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Display_Name_for__should_be_one_of__instead_of
-msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
@@ -1120,13 +1125,13 @@ msgid "Unable to resolve discriminator {0} on {2} found in the definitions becau
 msgstr "Der in den Definitionen gefundene Diskriminator {0} auf {2} kann nicht aufgel\u00f6st werden, da die Erweiterung {1} nicht im Profil {3} gefunden wurde."
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} type profiles"
 msgid_plural "Error in discriminator at {1}: no children, {0} type profiles"
 msgstr[0] ""
 msgstr[1] ""
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} types"
 msgid_plural "Error in discriminator at {1}: no children, {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -1144,7 +1149,7 @@ msgid "Invalid use of ofType() in discriminator - Type has no code on {0}"
 msgstr "Ung\u00fcltige Verwendung von ofType() in Diskriminator - Typ verf\u00fcgt \u00fcber keinen Code auf {0}"
 
 #: FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
@@ -1170,7 +1175,7 @@ msgid "Invalid use of ofType() in discriminator - no type on element {0}"
 msgstr "Unzul\u00e4ssige Verwendung von ofType() im Diskriminator - kein Typ in Element {0} definiert"
 
 #: FHIRPATH_FOCUS
-msgid ""
+msgid "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
@@ -1183,16 +1188,16 @@ msgstr "Interner Fehler beim Auswerten des FHIRPath-Ausdrucks: Es werden keine H
 msgid "The type {0} is not valid"
 msgstr ""
 
-#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
-msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
-msgstr "Fehler bei der Auswertung eines FHIRPath-Ausdrucks: Der linke Operand zu {0} hat den falschen Typ {1}"
-
 #: FHIRPATH_LEFT_VALUE
-msgid ""
+msgid "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
 
+#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
+msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
+msgstr "Fehler bei der Auswertung eines FHIRPath-Ausdrucks: Der linke Operand zu {0} hat den falschen Typ {1}"
+
 #: FHIRPATH_LOCATION
 msgid "(at {0})"
 msgstr "(bei {0})"
@@ -1238,6 +1243,10 @@ msgstr "Fehler bei der Auswertung des FHIRPath-Ausdrucks: Der Ausdruckstyp {0} w
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on primitives"
 msgstr ""
 
+#: FHIRPATH_REDEFINE_VARIABLE
+msgid "The variable ''{0}'' cannot be redefined"
+msgstr ""
+
 #: FHIRPATH_REFERENCE_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered string, uri, canonical or Reference but found {1}"
 msgstr "Fehler bei der Auswertung des FHIRPath-Ausdrucks: Die Funktion {0} kann nur auf einen geordneten String, uri, canonical oder Reference angewendet werden, wurde aber gefunden {1}"
@@ -1247,21 +1256,21 @@ msgid "Problem with use of resolve() - profile {0} on {1} could not be resolved"
 msgstr "Problem bei der Verwendung von resolve() - Profil {0} auf {1} konnte nicht aufgel\u00f6st werden"
 
 #: FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
 
+#: FHIRPATH_RIGHT_VALUE
+msgid "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgstr[0] ""
+msgstr[1] ""
+
 #: FHIRPATH_RIGHT_VALUE_WRONG_TYPE
 msgid "Error evaluating FHIRPath expression: right operand to {0} has the wrong type {1}"
 msgstr "Fehler bei der Auswertung eines FHIRPath-Ausdrucks: der rechte Operand zu {0} hat den falschen Typ {1}"
 
-#: FHIRPATH_RIGHT_VALUE
-msgid ""
-msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
-msgstr[0] ""
-msgstr[1] ""
-
 #: FHIRPATH_STRING_ORD_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered collection of string, uri, code, id but found {1}"
 msgstr "Fehler bei der Auswertung des FHIRPath-Ausdrucks: Die Funktion {0} kann nur auf eine geordnete Sammlung von string, uri, code, id angewendet werden, wurde aber {1} gefunden"
@@ -1746,7 +1755,7 @@ msgid "Reference to withdrawn {2} {0} from {1}"
 msgstr ""
 
 #: MULTIPLE_LOGICAL_MODELS
-msgid ""
+msgid "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgid_plural "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -1768,7 +1777,7 @@ msgid "The element {0} is not marked as ''mustSupport'' in the profile {1}. Cons
 msgstr "Das Element {0} ist im Profil {1} nicht als ''mustSupport'' gekennzeichnet. Erw\u00e4gen Sie, das Element nicht zu verwenden oder das Element als ''must-Support'' im Profil zu markieren."
 
 #: NO_VALID_DISPLAY_FOUND
-msgid "No valid Display Names found for {1}#{2} in the language {4}"
+msgid "No valid Display Names found for {1}#{2} in the languages {4}"
 msgid_plural "No valid Display Names found for {1}#{2} in the languages {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -1822,7 +1831,7 @@ msgid "Node type {0} is not allowed"
 msgstr "Nodetyp {0} ist nicht erlaubt"
 
 #: None_of_the_provided_codes_are_in_the_value_set
-msgid "The provided code {2} was not found in the value set ''{1}''"
+msgid "None of the provided codes [{2}] are in the value set ''{1}''"
 msgid_plural "None of the provided codes [{2}] are in the value set ''{1}''"
 msgstr[0] ""
 msgstr[1] ""
@@ -1896,7 +1905,7 @@ msgid "The element definition ``{0}`` in the profile ''{1}'' requires that a val
 msgstr ""
 
 #: PRIMITIVE_VALUE_ALTERNATIVES_MESSAGE
-msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, the extension ''{2}'' must be present"
+msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgid_plural "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgstr[0] ""
 msgstr[1] ""
@@ -1954,7 +1963,7 @@ msgid "Profile based discriminators must have a type with a profile ({0} in prof
 msgstr "Profilbasierte Diskriminatoren m\u00fcssen einen Typ mit einem Profil ({0} im Profil {1}) haben."
 
 #: Profile_based_discriminators_must_have_only_one_type__in_profile
-msgid ""
+msgid "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgid_plural "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -2138,7 +2147,7 @@ msgid "Only one response answer item with this linkId allowed"
 msgstr "Nur ein Antwortelement mit dieser LinkId zul\u00e4ssig"
 
 #: Questionnaire_QR_Item_OnlyOneI
-msgid ""
+msgid "Only one response item with the linkId {1} allowed - found {0} items"
 msgid_plural "Only one response item with the linkId {1} allowed - found {0} items"
 msgstr[0] ""
 msgstr[1] ""
@@ -2160,7 +2169,7 @@ msgid "Cannot validate time answer option because no option list is provided"
 msgstr "Kann die time answer option nicht validieren, weil keine Optionsliste zur Verf\u00fcgung steht"
 
 #: Questionnaire_QR_Item_WrongType
-msgid "Answer value must be of the type {1}"
+msgid "Answer value must be one of the {0} types {1}"
 msgid_plural "Answer value must be one of the {0} types {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2379,13 +2388,13 @@ msgid "Profile {0} is for type {1}, which is not a {4} (which is required becaus
 msgstr "Profil {0} ist f\u00fcr den Typ {1}, der kein {4} ist (was erforderlich ist, weil das Element {3} den Typ {2} hat)"
 
 #: SD_ED_TYPE_PROFILE_WRONG_TYPE
-msgid "The type {0} is not in the list of allowed type {1} in the profile {2}"
+msgid "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgid_plural "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgstr[0] ""
 msgstr[1] ""
 
 #: SD_ED_TYPE_WRONG_TYPE
-msgid "The element has a type {0} which is different to the type {1} on the base profile {2}"
+msgid "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgid_plural "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2874,7 +2883,11 @@ msgid "Could not confirm that the codes provided are from the required value set
 msgstr "Es konnte nicht best\u00e4tigt werden, dass die angegebenen Codes aus dem required ValueSet {0} stammen, da es keinen Terminologiedienst gibt"
 
 #: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES
-msgid "The OID ''{0}'' matches multiple code systems ({1})"
+msgid "The OID ''{0}'' matches multiple resources ({1})"
+msgstr ""
+
+#: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES_CHOSEN
+msgid "The OID ''{0}'' matches multiple resources ({2}); {1} was chosen as the most appropriate"
 msgstr ""
 
 #: TERMINOLOGY_TX_SYSTEM_HTTPS
@@ -2899,7 +2912,7 @@ msgid "The code system reference {0} is wrong - the code system reference cannot
 msgstr "Die Code-System-Referenz {0} ist falsch - die Code-System-Referenz kann nicht auf eine HTML-Seite verweisen. Dies k\u00f6nnte die richtige Referenz sein: {1}"
 
 #: TERMINOLOGY_TX_UNKNOWN_OID
-msgid "The OID ''{0}'' is not known, so the code can't be validated"
+msgid "The OID ''{0}'' is not known, so the code can''t be validated"
 msgstr ""
 
 #: TERMINOLOGY_TX_WARNING
@@ -3661,7 +3674,7 @@ msgid "The Unicode sequence has unterminated bi-di control characters (see CVE-2
 msgstr "!!Die Unicode-Sequenz hat unterminierte bi-di Steuerzeichen (siehe CVE-2021-42574): {1}"
 
 #: UNICODE_XML_BAD_CHARS
-msgid "This content includes the character {1} (hex value). This character is illegal in the XML version of FHIR, and there is generally no valid use for such characters"
+msgid "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgid_plural "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgstr[0] ""
 msgstr[1] ""
@@ -3809,9 +3822,9 @@ msgid "The System URI could not be determined for the code ''{0}'' in the ValueS
 msgstr "!!System nicht aufl\u00f6sbar - ValueSet enth\u00e4lt Importe"
 
 #: Unable_to_resolve_system__value_set_has_include_with_filter
-#| Unable to resolve system - value set {0} include #{1} has a filter on system {2}
+#| The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}
-msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}"
+msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}: {4}"
-msgstr "!!System kann nicht aufgel\u00f6st werden - ValueSet {0} include #{1} hat einen Filter auf System {2}"
+msgstr "!!!!System kann nicht aufgel\u00f6st werden - ValueSet {0} include #{1} hat einen Filter auf System {2}"
 
 #: Unable_to_resolve_system__value_set_has_include_with_no_system
 msgid "Unable to resolve system - value set {0} include #{1} has no system"
@@ -4052,7 +4065,7 @@ msgid "The resource status ''{0}'' and the standards status ''{1}'' may not be c
 msgstr ""
 
 #: VALUESET_BAD_FILTER_OP
-msgid "The operation ''{0}'' is not allowed for property ''{1}''. Allowed ops: {2}"
+msgid "The operation ''{0}'' is not allowed for property ''{1}'' in system ''{3}''. Allowed ops: {2}"
 msgstr ""
 
 #: VALUESET_BAD_FILTER_VALUE_BOOLEAN
@@ -4091,6 +4104,10 @@ msgstr ""
 msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3})"
 msgstr ""
 
+#: VALUESET_BAD_FILTER_VALUE_VALID_CODE_CHANGE
+msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3}). Note that this is change from the past; terminology servers are expected to still continue to support this filter"
+msgstr ""
+
 #: VALUESET_BAD_FILTER_VALUE_VALID_REGEX
 msgid "The value for a filter based on property ''{0}'' should be a valid regex, not ''{1}'' (err = ''{2}'')"
 msgstr ""
@@ -4214,7 +4231,7 @@ msgid "Published value sets SHALL conform to the ShareableValueSet profile, whic
 msgstr "!!Das ShareableValueSet-Profil sagt, dass das {0}-Element obligatorisch ist, aber es wird nicht gefunden. HL7 Published ValueSets M\u00dcSSEN mit dem ShareableValueSet-Profil \u00fcbereinstimmen"
 
 #: VALUESET_SUPPLEMENT_MISSING
-msgid "Required supplement not found: {1}"
+msgid "Required supplements not found: {1}"
 msgid_plural "Required supplements not found: {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -4245,7 +4262,7 @@ msgid "The property ''{0}'' is not known for the system ''{1}'', so may not be u
 msgstr ""
 
 #: VALUESET_UNKNOWN_FILTER_PROPERTY_NO_CS
-msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it's useful, the list of generally known properties for all systems is {2}"
+msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it''s useful, the list of generally known properties for all systems is {2}"
 msgstr ""
 
 #: Validation_BUNDLE_Message
@@ -4271,32 +4288,32 @@ msgid_plural "{3}: max allowed = {7}, but found {0} (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Validation_VAL_Profile_Minimum_SLICE
-msgid "Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice"
-msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
-msgstr[0] ""
-msgstr[1] ""
-
 #: Validation_VAL_Profile_Minimum
 msgid "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgid_plural "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
+#: Validation_VAL_Profile_Minimum_SLICE
+msgid "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgstr[0] ""
+msgstr[1] ""
+
 #: Validation_VAL_Profile_MultipleMatches
-msgid "Found multiple matching profiles among {0} choice: {1}"
+msgid "Found multiple matching profiles among {0} choices: {1}"
 msgid_plural "Found multiple matching profiles among {0} choices: {1}"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Validation_VAL_Profile_NoCheckMax
-msgid "{3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Validation_VAL_Profile_NoCheckMin
-msgid "{3}: Found {0} match, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4396,7 +4413,7 @@ msgid "The URL is not valid because ''({1})'': {0}"
 msgstr "Die URL ist nicht g\u00fcltig, weil ''({1})'': {0}"
 
 #: XHTML_URL_INVALID_CHARS
-msgid "URL contains Invalid Character ({1})"
+msgid "URL contains {0} Invalid Characters ({1})"
 msgid_plural "URL contains {0} Invalid Characters ({1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4546,3 +4563,4 @@ msgstr "Die XML-Kodierung ist ung\u00fcltig (muss UTF-8 sein)"
 #: xml_stated_encoding_invalid
 msgid "The XML encoding stated in the header is invalid (must be ''UTF-8'' if stated)"
 msgstr "Die im Header angegebene XML-Kodierung ist ung\u00fcltig (muss ''UTF-8'' sein, wenn angegeben)"
+

org.hl7.fhir.utilities/src/main/resources/source/validator-messages-es.po

@@ -1,5 +1,3 @@
-// en -> es
-Plural-Forms: nplurals=2; plural=n != 1;
 
 #: ABSTRACT_CODE_NOT_ALLOWED
 msgid "Code ''{0}#{1}'' is abstract, and not allowed in this context"
@@ -60,6 +58,14 @@ msgstr "Intento de utilizar el servidor terminológico pero no hay ninguno dispo
 msgid "Attempt to use a snapshot on profile ''{0}'' as {1} before it is generated"
 msgstr "Intento de usar un snapshot en el perfil ''{0}'' como {1} antes que se genere"
 
+#: BINDING_ADDITIONAL
+msgid "{0} specified in an additional binding"
+msgstr ""
+
+#: BINDING_MAX
+msgid "{0} specified in the max binding"
+msgstr ""
+
 #: BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE
 msgid "Found {0} matches for ''{1}'' in the bundle ({2})"
 msgstr ""
@@ -85,7 +91,7 @@ msgid "The {1} resource did not math the profile {2} because: {3}"
 msgstr ""
 
 #: BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT
-msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there is a resource in the bundle with the same type and id, but it does not match because of the fullUrl based rules around matching relative references (must be ``{3}``)"
+msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgid_plural "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgstr[0] ""
 msgstr[1] ""
@@ -284,7 +290,7 @@ msgid "The type ''{0}'' is not valid - must be {1} (allowed = {2})"
 msgstr "El tipo ''{0}'' no es válido - debe ser {1} (permitido = {2})"
 
 #: Bundle_BUNDLE_Entry_Type3
-msgid "The type ''{1}'' is not valid - must be of type {2}"
+msgid "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgid_plural "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -449,7 +455,7 @@ msgid "This property has only the standard code (''{0}'') but not the standard U
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_NO_VALUE
-msgid "The property ''{0}'' has no value, and cannot be understoof"
+msgid "The property ''{0}'' has no value, and cannot be understood"
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_SYNONYM_CHECK
@@ -668,7 +674,7 @@ msgid "Contained resource does not appear to be a FHIR resource (unknown name ''
 msgstr "El recurso contenido no parece ser un recurso FHIR (nombre desconocido ''{0}'')"
 
 #: Could_not_match_discriminator_for_slice_in_profile
-msgid "Could not match discriminator ({0}) for slice {1} in profile {2} - the discriminator {3} does not have fixed value, binding or existence assertions"
+msgid "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgid_plural "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgstr[0] ""
 msgstr[1] ""
@@ -731,7 +737,7 @@ msgid "Discriminator ({0}) is based on element existence, but slice {1} neither
 msgstr "El discriminador ({0}) está basado en la existencia de un elemento, pero la partición {1} no define cardinalidad  min>=1 o max=0"
 
 #: Discriminator__is_based_on_type_but_slice__in__has_multiple_types
-msgid ""
+msgid "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgid_plural "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -742,14 +748,14 @@ msgid "Discriminator ({0}) is based on type, but slice {1} in {2} has no types"
 msgstr "El discriminador ({0}) se basa en tipo, pero la partición {1} en {2} no tiene tipos"
 
 #: Display_Name_WS_for__should_be_one_of__instead_of
-msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: Display_Name_for__should_be_one_of__instead_of
-msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
@@ -1120,14 +1126,14 @@ msgid "Unable to resolve discriminator {0} on {2} found in the definitions becau
 msgstr "Imposible resolver el discriminador{0} en {2} encontrado en las definiciones porque la extension {1} no ha sido encontrada en el perfil {3}"
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} type profiles"
 msgid_plural "Error in discriminator at {1}: no children, {0} type profiles"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} types"
 msgid_plural "Error in discriminator at {1}: no children, {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -1146,7 +1152,7 @@ msgid "Invalid use of ofType() in discriminator - Type has no code on {0}"
 msgstr "Uso ilegal de ofType() en el discriminador - Type no tiene codigo en {0}"
 
 #: FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
@@ -1173,7 +1179,7 @@ msgid "Invalid use of ofType() in discriminator - no type on element {0}"
 msgstr "Uso ilegal de ofType() en el discriminador - no hay tipo en el elemento {0}"
 
 #: FHIRPATH_FOCUS
-msgid ""
+msgid "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
@@ -1187,17 +1193,17 @@ msgstr "Internal Error evaluando la expresión FHIRPath: No se proveen servicios
 msgid "The type {0} is not valid"
 msgstr ""
 
-#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
-msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
-msgstr "Error evaluando la expresión FHIRPath: el operando a la izquierda de {0} tiene el tipo incorrecto {1}"
-
 #: FHIRPATH_LEFT_VALUE
-msgid ""
+msgid "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
+msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
+msgstr "Error evaluando la expresión FHIRPath: el operando a la izquierda de {0} tiene el tipo incorrecto {1}"
+
 #: FHIRPATH_LOCATION
 msgid "(at {0})"
 msgstr "(en {0})"
@@ -1243,6 +1249,10 @@ msgstr "Error evaluando la expresión FHIRPath: El tipo de expresión {0} no est
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on primitives"
 msgstr ""
 
+#: FHIRPATH_REDEFINE_VARIABLE
+msgid "The variable ''{0}'' cannot be redefined"
+msgstr ""
+
 #: FHIRPATH_REFERENCE_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered string, uri, canonical or Reference but found {1}"
 msgstr "Error evaluando la expresión FHIRPath: La función {0} solo puede ser utilizada para los tipos string, uri, canonical or Reference pero se han encontrado {1}"
@@ -1252,23 +1262,23 @@ msgid "Problem with use of resolve() - profile {0} on {1} could not be resolved"
 msgstr "Problema con el uso de resolve() - el perfil {0} en {1} no pudo ser resuelta"
 
 #: FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: FHIRPATH_RIGHT_VALUE
+msgid "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: FHIRPATH_RIGHT_VALUE_WRONG_TYPE
 msgid "Error evaluating FHIRPath expression: right operand to {0} has the wrong type {1}"
 msgstr "Error evaluando la expresión FHIRPath: el operando a la derecha de {0} tiene el tipo incorrecto {1}"
 
-#: FHIRPATH_RIGHT_VALUE
-msgid ""
-msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: FHIRPATH_STRING_ORD_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered collection of string, uri, code, id but found {1}"
 msgstr "Error evaluando la expresión FHIRPath: La función {0} solo puede ser utilizada para colecciones ordenadas de tipo string, uri, code, id pero se han encontrado {1}"
@@ -1754,7 +1764,7 @@ msgid "Reference to withdrawn {2} {0} from {1}"
 msgstr ""
 
 #: MULTIPLE_LOGICAL_MODELS
-msgid ""
+msgid "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgid_plural "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -1777,7 +1787,7 @@ msgid "The element {0} is not marked as ''mustSupport'' in the profile {1}. Cons
 msgstr "El elemento {0} no está marcado como ''mustSupport'' en el perfil {1}. Considere no usar el elemento, o marcar el elemento como must-Support en el perfil"
 
 #: NO_VALID_DISPLAY_FOUND
-msgid "No valid Display Names found for {1}#{2} in the language {4}"
+msgid "No valid Display Names found for {1}#{2} in the languages {4}"
 msgid_plural "No valid Display Names found for {1}#{2} in the languages {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -1832,7 +1842,7 @@ msgid "Node type {0} is not allowed"
 msgstr "El tipo de nodo {0} no está permitido"
 
 #: None_of_the_provided_codes_are_in_the_value_set
-msgid "The provided code {2} was not found in the value set ''{1}''"
+msgid "None of the provided codes [{2}] are in the value set ''{1}''"
 msgid_plural "None of the provided codes [{2}] are in the value set ''{1}''"
 msgstr[0] ""
 msgstr[1] ""
@@ -1907,7 +1917,7 @@ msgid "The element definition ``{0}`` in the profile ''{1}'' requires that a val
 msgstr ""
 
 #: PRIMITIVE_VALUE_ALTERNATIVES_MESSAGE
-msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, the extension ''{2}'' must be present"
+msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgid_plural "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgstr[0] ""
 msgstr[1] ""
@@ -1966,7 +1976,7 @@ msgid "Profile based discriminators must have a type with a profile ({0} in prof
 msgstr "Los discriminadores basados en perfiles deben tener un tipo con un perfil ({0} en el perfil {1})"
 
 #: Profile_based_discriminators_must_have_only_one_type__in_profile
-msgid ""
+msgid "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgid_plural "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -2150,7 +2160,7 @@ msgid "Only one response answer item with this linkId allowed"
 msgstr "Solo un item con respuesta se permite para items que tengan este linkId"
 
 #: Questionnaire_QR_Item_OnlyOneI
-msgid ""
+msgid "Only one response item with the linkId {1} allowed - found {0} items"
 msgid_plural "Only one response item with the linkId {1} allowed - found {0} items"
 msgstr[0] ""
 msgstr[1] ""
@@ -2173,7 +2183,7 @@ msgid "Cannot validate time answer option because no option list is provided"
 msgstr "No se puede validar la opción de respuesta de tipo time porque no se ha provisto una lista de opciones"
 
 #: Questionnaire_QR_Item_WrongType
-msgid "Answer value must be of the type {1}"
+msgid "Answer value must be one of the {0} types {1}"
 msgid_plural "Answer value must be one of the {0} types {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2394,14 +2404,14 @@ msgid "Profile {0} is for type {1}, which is not a {4} (which is required becaus
 msgstr "El perfil {0} es para tipo {1}, que no es un {4} (que es requerido porque el elemento {3} es de tipo {2})"
 
 #: SD_ED_TYPE_PROFILE_WRONG_TYPE
-msgid "The type {0} is not in the list of allowed type {1} in the profile {2}"
+msgid "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgid_plural "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: SD_ED_TYPE_WRONG_TYPE
-msgid "The element has a type {0} which is different to the type {1} on the base profile {2}"
+msgid "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgid_plural "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2889,7 +2899,11 @@ msgid "Could not confirm that the codes provided are from the required value set
 msgstr "No se pudo confirmar que los códigos provistos pertenezcan al conjunto de valores requerido {0} porque no hay servicio terminológico"
 
 #: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES
-msgid "The OID ''{0}'' matches multiple code systems ({1})"
+msgid "The OID ''{0}'' matches multiple resources ({1})"
+msgstr ""
+
+#: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES_CHOSEN
+msgid "The OID ''{0}'' matches multiple resources ({2}); {1} was chosen as the most appropriate"
 msgstr ""
 
 #: TERMINOLOGY_TX_SYSTEM_HTTPS
@@ -2914,7 +2928,7 @@ msgid "The code system reference {0} is wrong - the code system reference cannot
 msgstr "La referencia al sistema de codificación {0} es errónea - no puede apuntar a una página HTML. Esta puede ser la referencia correcta: {1}"
 
 #: TERMINOLOGY_TX_UNKNOWN_OID
-msgid "The OID ''{0}'' is not known, so the code can't be validated"
+msgid "The OID ''{0}'' is not known, so the code can''t be validated"
 msgstr ""
 
 #: TERMINOLOGY_TX_WARNING
@@ -3684,7 +3698,7 @@ msgid "The Unicode sequence has unterminated bi-di control characters (see CVE-2
 msgstr "!!La secuencia Unicode tiene caracteres de control bi-di inconclusos (see CVE-2021-42574): {1}"
 
 #: UNICODE_XML_BAD_CHARS
-msgid "This content includes the character {1} (hex value). This character is illegal in the XML version of FHIR, and there is generally no valid use for such characters"
+msgid "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgid_plural "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgstr[0] ""
 msgstr[1] ""
@@ -3831,9 +3845,9 @@ msgid "The System URI could not be determined for the code ''{0}'' in the ValueS
 msgstr "!!Incapaz de resolver el sistema - el conjunto de valores tiene imports"
 
 #: Unable_to_resolve_system__value_set_has_include_with_filter
-#| Unable to resolve system - value set {0} include #{1} has a filter on system {2}
+#| The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}
-msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}"
+msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}: {4}"
-msgstr "!!Incapaz de resolver el sistema - conjunto de valores {0} include #{1} tiene un filtro en system {2}"
+msgstr "!!!!Incapaz de resolver el sistema - conjunto de valores {0} include #{1} tiene un filtro en system {2}"
 
 #: Unable_to_resolve_system__value_set_has_include_with_no_system
 msgid "Unable to resolve system - value set {0} include #{1} has no system"
@@ -4075,7 +4089,7 @@ msgid "The resource status ''{0}'' and the standards status ''{1}'' may not be c
 msgstr ""
 
 #: VALUESET_BAD_FILTER_OP
-msgid "The operation ''{0}'' is not allowed for property ''{1}''. Allowed ops: {2}"
+msgid "The operation ''{0}'' is not allowed for property ''{1}'' in system ''{3}''. Allowed ops: {2}"
 msgstr ""
 
 #: VALUESET_BAD_FILTER_VALUE_BOOLEAN
@@ -4114,6 +4128,10 @@ msgstr ""
 msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3})"
 msgstr ""
 
+#: VALUESET_BAD_FILTER_VALUE_VALID_CODE_CHANGE
+msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3}). Note that this is change from the past; terminology servers are expected to still continue to support this filter"
+msgstr ""
+
 #: VALUESET_BAD_FILTER_VALUE_VALID_REGEX
 msgid "The value for a filter based on property ''{0}'' should be a valid regex, not ''{1}'' (err = ''{2}'')"
 msgstr ""
@@ -4237,7 +4255,7 @@ msgid "Published value sets SHALL conform to the ShareableValueSet profile, whic
 msgstr "!!El perfil ShareableValueSet dice que el elemento {0} es obligatorio, pero no se encontró. Los conjuntos de valores publicados por HL7 DEBEN conformar al perfil ShareableValueSet"
 
 #: VALUESET_SUPPLEMENT_MISSING
-msgid "Required supplement not found: {1}"
+msgid "Required supplements not found: {1}"
 msgid_plural "Required supplements not found: {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -4268,7 +4286,7 @@ msgid "The property ''{0}'' is not known for the system ''{1}'', so may not be u
 msgstr ""
 
 #: VALUESET_UNKNOWN_FILTER_PROPERTY_NO_CS
-msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it's useful, the list of generally known properties for all systems is {2}"
+msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it''s useful, the list of generally known properties for all systems is {2}"
 msgstr ""
 
 #: Validation_BUNDLE_Message
@@ -4295,13 +4313,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: Validation_VAL_Profile_Minimum_SLICE
-msgid "Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice"
-msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #: Validation_VAL_Profile_Minimum
 msgid "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgid_plural "{3}: minimum required = {7}, but only found {0} (from {1})"
@@ -4309,22 +4320,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: Validation_VAL_Profile_Minimum_SLICE
+msgid "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: Validation_VAL_Profile_MultipleMatches
-msgid "Found multiple matching profiles among {0} choice: {1}"
+msgid "Found multiple matching profiles among {0} choices: {1}"
 msgid_plural "Found multiple matching profiles among {0} choices: {1}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: Validation_VAL_Profile_NoCheckMax
-msgid "{3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: Validation_VAL_Profile_NoCheckMin
-msgid "{3}: Found {0} match, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4425,7 +4443,7 @@ msgid "The URL is not valid because ''({1})'': {0}"
 msgstr "La URL no es válida porque ''({1})'': {0}"
 
 #: XHTML_URL_INVALID_CHARS
-msgid "URL contains Invalid Character ({1})"
+msgid "URL contains {0} Invalid Characters ({1})"
 msgid_plural "URL contains {0} Invalid Characters ({1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4576,3 +4594,4 @@ msgstr "La codificación de XML es inválida (debe ser UTF-8)"
 #: xml_stated_encoding_invalid
 msgid "The XML encoding stated in the header is invalid (must be ''UTF-8'' if stated)"
 msgstr "La codificación de XML declarada en la cabecera es inválida (debe ser ''UTF-8'' si se declara)"
+

org.hl7.fhir.utilities/src/main/resources/source/validator-messages-ja.po

@@ -1,5 +1,3 @@
-// en -> ja
-Plural-Forms: nplurals=1; plural=0;
 
 #: ABSTRACT_CODE_NOT_ALLOWED
 msgid "Code ''{0}#{1}'' is abstract, and not allowed in this context"
@@ -60,6 +58,14 @@ msgstr "利用可能なTerminologyサーバがないときにTerminologyサー
 msgid "Attempt to use a snapshot on profile ''{0}'' as {1} before it is generated"
 msgstr "プロファイル ''{0}'' のsnapshotを生成する前に {1} として使用しようとしました"
 
+#: BINDING_ADDITIONAL
+msgid "{0} specified in an additional binding"
+msgstr ""
+
+#: BINDING_MAX
+msgid "{0} specified in the max binding"
+msgstr ""
+
 #: BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE
 msgid "Found {0} matches for ''{1}'' in the bundle ({2})"
 msgstr ""
@@ -85,7 +91,7 @@ msgid "The {1} resource did not math the profile {2} because: {3}"
 msgstr ""
 
 #: BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT
-msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there is a resource in the bundle with the same type and id, but it does not match because of the fullUrl based rules around matching relative references (must be ``{3}``)"
+msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgid_plural "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgstr[0] ""
 
@@ -282,7 +288,7 @@ msgid "The type ''{0}'' is not valid - must be {1} (allowed = {2})"
 msgstr "タイプ''{0}''は有効ではありません - {1}でなければなりません（allowed = {2}）"
 
 #: Bundle_BUNDLE_Entry_Type3
-msgid "The type ''{1}'' is not valid - must be of type {2}"
+msgid "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgid_plural "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgstr[0] ""
 
@@ -444,7 +450,7 @@ msgid "This property has only the standard code (''{0}'') but not the standard U
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_NO_VALUE
-msgid "The property ''{0}'' has no value, and cannot be understoof"
+msgid "The property ''{0}'' has no value, and cannot be understood"
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_SYNONYM_CHECK
@@ -660,7 +666,7 @@ msgid "Contained resource does not appear to be a FHIR resource (unknown name ''
 msgstr "含まれているリソースはFHIRリソースではないようです（未知の名前 ''{0}''）"
 
 #: Could_not_match_discriminator_for_slice_in_profile
-msgid "Could not match discriminator ({0}) for slice {1} in profile {2} - the discriminator {3} does not have fixed value, binding or existence assertions"
+msgid "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgid_plural "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgstr[0] ""
 
@@ -721,7 +727,7 @@ msgid "Discriminator ({0}) is based on element existence, but slice {1} neither
 msgstr "discriminator ({0}) は要素の存在に基づいていますが、スライス {1} は min>=1 も max=0 も設定していません"
 
 #: Discriminator__is_based_on_type_but_slice__in__has_multiple_types
-msgid ""
+msgid "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgid_plural "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgstr[0] ""
 
@@ -730,12 +736,12 @@ msgid "Discriminator ({0}) is based on type, but slice {1} in {2} has no types"
 msgstr "discriminator ({0}) はタイプに基づいていますが、{2} のスライス {1} にはタイプがありません"
 
 #: Display_Name_WS_for__should_be_one_of__instead_of
-msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 
 #: Display_Name_for__should_be_one_of__instead_of
-msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 
@@ -1103,12 +1109,12 @@ msgid "Unable to resolve discriminator {0} on {2} found in the definitions becau
 msgstr "定義内でdiscriminator {0} を {2} 上で見つけたが、extension {1} がプロファイル {3} に見つからなかったため解決できません"
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} type profiles"
 msgid_plural "Error in discriminator at {1}: no children, {0} type profiles"
 msgstr[0] ""
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} types"
 msgid_plural "Error in discriminator at {1}: no children, {0} types"
 msgstr[0] ""
 
@@ -1125,7 +1131,7 @@ msgid "Invalid use of ofType() in discriminator - Type has no code on {0}"
 msgstr "discriminatorでのofType()の使用が無効 - タイプにコードがありません {0}"
 
 #: FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgstr[0] ""
 
@@ -1150,7 +1156,7 @@ msgid "Invalid use of ofType() in discriminator - no type on element {0}"
 msgstr "discriminatorでのofType()の使用が無効 - 要素 {0} にタイプがありません"
 
 #: FHIRPATH_FOCUS
-msgid ""
+msgid "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgstr[0] ""
 
@@ -1162,15 +1168,15 @@ msgstr "FHIRPath式を評価する際の内部エラー: ホストサービス
 msgid "The type {0} is not valid"
 msgstr ""
 
+#: FHIRPATH_LEFT_VALUE
+msgid "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
+msgid_plural "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
+msgstr[0] ""
+
 #: FHIRPATH_LEFT_VALUE_WRONG_TYPE
 msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
 msgstr "FHIRPath式の評価エラー: {0}への左オペランドは間違ったタイプ {1} を持っています"
 
-#: FHIRPATH_LEFT_VALUE
-msgid ""
-msgid_plural "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
-msgstr[0] ""
-
 #: FHIRPATH_LOCATION
 msgid "(at {0})"
 msgstr "(at {0})"
@@ -1215,6 +1221,10 @@ msgstr "FHIRPath式の評価エラー: 式タイプ {0} は関数 {2} のパラ
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on primitives"
 msgstr "FHIRPath式の評価エラー: 関数 {0} はプリミティブに対してのみ使用できます"
 
+#: FHIRPATH_REDEFINE_VARIABLE
+msgid "The variable ''{0}'' cannot be redefined"
+msgstr ""
+
 #: FHIRPATH_REFERENCE_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered string, uri, canonical or Reference but found {1}"
 msgstr "FHIRPath式の評価エラー: 関数 {0} は順序付けされた文字列、URI、canonical、Referenceに対してのみ使用できますが、{1} を見つけました"
@@ -1224,19 +1234,19 @@ msgid "Problem with use of resolve() - profile {0} on {1} could not be resolved"
 msgstr "resolve()の使用に問題 - {1}上のプロファイル{0}を解決できません"
 
 #: FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgstr[0] ""
 
+#: FHIRPATH_RIGHT_VALUE
+msgid "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgstr[0] ""
+
 #: FHIRPATH_RIGHT_VALUE_WRONG_TYPE
 msgid "Error evaluating FHIRPath expression: right operand to {0} has the wrong type {1}"
 msgstr "FHIRPath式の評価エラー: {0}への右オペランドは間違ったタイプ {1} を持っています"
 
-#: FHIRPATH_RIGHT_VALUE
-msgid ""
-msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
-msgstr[0] ""
-
 #: FHIRPATH_STRING_ORD_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered collection of string, uri, code, id but found {1}"
 msgstr "FHIRPath式の評価エラー: 関数 {0} は順序付けされた文字列、URI、code、idのコレクションに対してのみ使用できますが、{1} を見つけました"
@@ -1717,7 +1727,7 @@ msgid "Reference to withdrawn {2} {0} from {1}"
 msgstr ""
 
 #: MULTIPLE_LOGICAL_MODELS
-msgid ""
+msgid "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgid_plural "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgstr[0] ""
 
@@ -1738,7 +1748,7 @@ msgid "The element {0} is not marked as ''mustSupport'' in the profile {1}. Cons
 msgstr ""
 
 #: NO_VALID_DISPLAY_FOUND
-msgid "No valid Display Names found for {1}#{2} in the language {4}"
+msgid "No valid Display Names found for {1}#{2} in the languages {4}"
 msgid_plural "No valid Display Names found for {1}#{2} in the languages {4}"
 msgstr[0] ""
 
@@ -1791,7 +1801,7 @@ msgid "Node type {0} is not allowed"
 msgstr "ノードタイプ {0} は許可されていません"
 
 #: None_of_the_provided_codes_are_in_the_value_set
-msgid "The provided code {2} was not found in the value set ''{1}''"
+msgid "None of the provided codes [{2}] are in the value set ''{1}''"
 msgid_plural "None of the provided codes [{2}] are in the value set ''{1}''"
 msgstr[0] ""
 
@@ -1864,7 +1874,7 @@ msgid "The element definition ``{0}`` in the profile ''{1}'' requires that a val
 msgstr "プロファイル ''{1}'' の要素定義 {0} では、この要素に値が存在することが必要です"
 
 #: PRIMITIVE_VALUE_ALTERNATIVES_MESSAGE
-msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, the extension ''{2}'' must be present"
+msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgid_plural "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgstr[0] ""
 
@@ -1921,7 +1931,7 @@ msgid "Profile based discriminators must have a type with a profile ({0} in prof
 msgstr "プロファイルベースのディスクリミネータはプロファイルを持つタイプを持つ必要があります（プロファイル {1} の {0}）"
 
 #: Profile_based_discriminators_must_have_only_one_type__in_profile
-msgid ""
+msgid "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgid_plural "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgstr[0] ""
 
@@ -2104,7 +2114,7 @@ msgid "Only one response answer item with this linkId allowed"
 msgstr "このLinkIdを持つ回答アイテムは1つだけ許可されます"
 
 #: Questionnaire_QR_Item_OnlyOneI
-msgid ""
+msgid "Only one response item with the linkId {1} allowed - found {0} items"
 msgid_plural "Only one response item with the linkId {1} allowed - found {0} items"
 msgstr[0] ""
 
@@ -2125,7 +2135,7 @@ msgid "Cannot validate time answer option because no option list is provided"
 msgstr "オプションリストが提供されていないため、時間型の回答オプションを検証することはできません"
 
 #: Questionnaire_QR_Item_WrongType
-msgid "Answer value must be of the type {1}"
+msgid "Answer value must be one of the {0} types {1}"
 msgid_plural "Answer value must be one of the {0} types {1}"
 msgstr[0] ""
 
@@ -2343,12 +2353,12 @@ msgid "Profile {0} is for type {1}, which is not a {4} (which is required becaus
 msgstr "プロファイル {0} はタイプ {1} のためのもので、これは {4} ではありません（これは必要です、なぜなら {3} 要素はタイプ {2} だからです）"
 
 #: SD_ED_TYPE_PROFILE_WRONG_TYPE
-msgid "The type {0} is not in the list of allowed type {1} in the profile {2}"
+msgid "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgid_plural "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgstr[0] ""
 
 #: SD_ED_TYPE_WRONG_TYPE
-msgid "The element has a type {0} which is different to the type {1} on the base profile {2}"
+msgid "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgid_plural "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgstr[0] ""
 
@@ -2834,7 +2844,11 @@ msgid "Could not confirm that the codes provided are from the required value set
 msgstr "提供されたコードが必要なValueSet {0}からであることを確認できませんでした。用語サービスがないためです"
 
 #: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES
-msgid "The OID ''{0}'' matches multiple code systems ({1})"
+msgid "The OID ''{0}'' matches multiple resources ({1})"
+msgstr ""
+
+#: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES_CHOSEN
+msgid "The OID ''{0}'' matches multiple resources ({2}); {1} was chosen as the most appropriate"
 msgstr ""
 
 #: TERMINOLOGY_TX_SYSTEM_HTTPS
@@ -2859,7 +2873,7 @@ msgid "The code system reference {0} is wrong - the code system reference cannot
 msgstr "コードシステム参照{0}が間違っています - コードシステム参照はHTMLページにすることはできません。これが正しい参照である可能性があります：{1}"
 
 #: TERMINOLOGY_TX_UNKNOWN_OID
-msgid "The OID ''{0}'' is not known, so the code can't be validated"
+msgid "The OID ''{0}'' is not known, so the code can''t be validated"
 msgstr ""
 
 #: TERMINOLOGY_TX_WARNING
@@ -3617,7 +3631,7 @@ msgid "The Unicode sequence has unterminated bi-di control characters (see CVE-2
 msgstr "終端されていない制御文字を含むUnicodeシーケンス（CVE-2021-42574参照）: {0}"
 
 #: UNICODE_XML_BAD_CHARS
-msgid "This content includes the character {1} (hex value). This character is illegal in the XML version of FHIR, and there is generally no valid use for such characters"
+msgid "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgid_plural "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgstr[0] ""
 
@@ -3762,9 +3776,9 @@ msgid "The System URI could not be determined for the code ''{0}'' in the ValueS
 msgstr "!!systemを解決できません - ValueSetにインポートがあります"
 
 #: Unable_to_resolve_system__value_set_has_include_with_filter
-#| Unable to resolve system - value set {0} include #{1} has a filter on system {2}
+#| The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}
-msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}"
+msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}: {4}"
-msgstr "!!systemを解決できません - ValueSet {0}のインクルード#{1}にsystem {2}のフィルターがあります"
+msgstr "!!!!systemを解決できません - ValueSet {0}のインクルード#{1}にsystem {2}のフィルターがあります"
 
 #: Unable_to_resolve_system__value_set_has_include_with_no_system
 msgid "Unable to resolve system - value set {0} include #{1} has no system"
@@ -4004,7 +4018,7 @@ msgid "The resource status ''{0}'' and the standards status ''{1}'' may not be c
 msgstr "リソースのステータス "{0}"は標準のステータス "{1}"と一貫しないため、確認すべきです"
 
 #: VALUESET_BAD_FILTER_OP
-msgid "The operation ''{0}'' is not allowed for property ''{1}''. Allowed ops: {2}"
+msgid "The operation ''{0}'' is not allowed for property ''{1}'' in system ''{3}''. Allowed ops: {2}"
 msgstr ""
 
 #: VALUESET_BAD_FILTER_VALUE_BOOLEAN
@@ -4043,6 +4057,10 @@ msgstr ""
 msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3})"
 msgstr ""
 
+#: VALUESET_BAD_FILTER_VALUE_VALID_CODE_CHANGE
+msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3}). Note that this is change from the past; terminology servers are expected to still continue to support this filter"
+msgstr ""
+
 #: VALUESET_BAD_FILTER_VALUE_VALID_REGEX
 msgid "The value for a filter based on property ''{0}'' should be a valid regex, not ''{1}'' (err = ''{2}'')"
 msgstr ""
@@ -4164,7 +4182,7 @@ msgid "Published value sets SHALL conform to the ShareableValueSet profile, whic
 msgstr "公開されたvalue setsはValueSet.{0}の存在を必須としているShareableValueSetプロファイルに準拠しなければなりません(SHALL)が、要素が存在しません。"
 
 #: VALUESET_SUPPLEMENT_MISSING
-msgid "Required supplement not found: {1}"
+msgid "Required supplements not found: {1}"
 msgid_plural "Required supplements not found: {1}"
 msgstr[0] ""
 
@@ -4195,7 +4213,7 @@ msgid "The property ''{0}'' is not known for the system ''{1}'', so may not be u
 msgstr ""
 
 #: VALUESET_UNKNOWN_FILTER_PROPERTY_NO_CS
-msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it's useful, the list of generally known properties for all systems is {2}"
+msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it''s useful, the list of generally known properties for all systems is {2}"
 msgstr ""
 
 #: Validation_BUNDLE_Message
@@ -4220,28 +4238,28 @@ msgid "{3}: max allowed = {7}, but found {0} (from {1})"
 msgid_plural "{3}: max allowed = {7}, but found {0} (from {1})"
 msgstr[0] ""
 
-#: Validation_VAL_Profile_Minimum_SLICE
-msgid "Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice"
-msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
-msgstr[0] ""
-
 #: Validation_VAL_Profile_Minimum
 msgid "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgid_plural "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgstr[0] ""
 
+#: Validation_VAL_Profile_Minimum_SLICE
+msgid "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgstr[0] ""
+
 #: Validation_VAL_Profile_MultipleMatches
-msgid "Found multiple matching profiles among {0} choice: {1}"
+msgid "Found multiple matching profiles among {0} choices: {1}"
 msgid_plural "Found multiple matching profiles among {0} choices: {1}"
 msgstr[0] ""
 
 #: Validation_VAL_Profile_NoCheckMax
-msgid "{3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 
 #: Validation_VAL_Profile_NoCheckMin
-msgid "{3}: Found {0} match, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 
@@ -4340,7 +4358,7 @@ msgid "The URL is not valid because ''({1})'': {0}"
 msgstr "URLは''({1})''のため有効ではありません：{0}"
 
 #: XHTML_URL_INVALID_CHARS
-msgid "URL contains Invalid Character ({1})"
+msgid "URL contains {0} Invalid Characters ({1})"
 msgid_plural "URL contains {0} Invalid Characters ({1})"
 msgstr[0] ""
 
@@ -4489,3 +4507,4 @@ msgstr "XMLエンコーディングが無効です（UTF-8でなければなり
 #: xml_stated_encoding_invalid
 msgid "The XML encoding stated in the header is invalid (must be ''UTF-8'' if stated)"
 msgstr "ヘッダーで指定されたXMLエンコーディングが無効です（指定されている場合は''UTF-8''でなければなりません）"
+

org.hl7.fhir.utilities/src/main/resources/source/validator-messages-nl.po

@@ -1,5 +1,3 @@
-// en -> nl
-Plural-Forms: nplurals=2; plural=n != 1;
 
 #: ABSTRACT_CODE_NOT_ALLOWED
 msgid "Code ''{0}#{1}'' is abstract, and not allowed in this context"
@@ -60,6 +58,14 @@ msgstr "Poging om terminologieserver te gebruiken terwijl er geen terminologiese
 msgid "Attempt to use a snapshot on profile ''{0}'' as {1} before it is generated"
 msgstr "Poging om een snapshot van profiel ''{0}'' te gebruiken als {1} voordat deze is gegenereerd"
 
+#: BINDING_ADDITIONAL
+msgid "{0} specified in an additional binding"
+msgstr ""
+
+#: BINDING_MAX
+msgid "{0} specified in the max binding"
+msgstr ""
+
 #: BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE
 msgid "Found {0} matches for ''{1}'' in the bundle ({2})"
 msgstr ""
@@ -85,7 +91,7 @@ msgid "The {1} resource did not math the profile {2} because: {3}"
 msgstr ""
 
 #: BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT
-msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there is a resource in the bundle with the same type and id, but it does not match because of the fullUrl based rules around matching relative references (must be ``{3}``)"
+msgid "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgid_plural "Can''t find ''{1}'' in the bundle ({2}). Note that there are {0} resources in the bundle with the same type and id, but they do not match because of the fullUrl based rules around matching relative references (one of ``{3}``)"
 msgstr[0] ""
 msgstr[1] ""
@@ -283,7 +289,7 @@ msgid "The type ''{0}'' is not valid - must be {1} (allowed = {2})"
 msgstr "Het type ''{0}'' is niet geldig - moet zijn {1} (toegestaan = {2})"
 
 #: Bundle_BUNDLE_Entry_Type3
-msgid "The type ''{1}'' is not valid - must be of type {2}"
+msgid "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgid_plural "The type ''{1}'' is not valid - must be one of {0} types: {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -446,7 +452,7 @@ msgid "This property has only the standard code (''{0}'') but not the standard U
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_NO_VALUE
-msgid "The property ''{0}'' has no value, and cannot be understoof"
+msgid "The property ''{0}'' has no value, and cannot be understood"
 msgstr ""
 
 #: CODESYSTEM_PROPERTY_SYNONYM_CHECK
@@ -672,7 +678,7 @@ msgid "Contained resource does not appear to be a FHIR resource (unknown name ''
 msgstr "Contained resource lijkt geen FHIR-type hebben (onbekende naam ''{0}'')"
 
 #: Could_not_match_discriminator_for_slice_in_profile
-msgid "Could not match discriminator ({0}) for slice {1} in profile {2} - the discriminator {3} does not have fixed value, binding or existence assertions"
+msgid "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgid_plural "Could not match any discriminators ({1}) for slice {2} in profile {3} - None of the {0} discriminators {4} have fixed value, binding or existence assertions"
 msgstr[0] ""
 msgstr[1] ""
@@ -734,7 +740,7 @@ msgid "Discriminator ({0}) is based on element existence, but slice {1} neither
 msgstr "Discriminator ({0}) is gebaseerd op elementaanwezigheid, maar slice {1} heeft geen min>=1 of max=0"
 
 #: Discriminator__is_based_on_type_but_slice__in__has_multiple_types
-msgid ""
+msgid "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgid_plural "Discriminator ({1}) is based on type, but slice {2} in {3} has {0} types: {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -744,13 +750,13 @@ msgid "Discriminator ({0}) is based on type, but slice {1} in {2} has no types"
 msgstr "Discriminator ({0}) is gebaseerd op type, maar slice {1} in {2} heeft geen typen"
 
 #: Display_Name_WS_for__should_be_one_of__instead_of
-msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong whitespace in Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Display_Name_for__should_be_one_of__instead_of
-msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is {3} (for the language(s) ''{5}'')"
+msgid "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgid_plural "Wrong Display Name ''{4}'' for {1}#{2}. Valid display is one of {0} choices: {3} (for the language(s) ''{5}'')"
 msgstr[0] ""
 msgstr[1] ""
@@ -1120,13 +1126,13 @@ msgid "Unable to resolve discriminator {0} on {2} found in the definitions becau
 msgstr "Unable to resolve discriminator {0} on {2} found in the definitions because the extension {1} wasn''t found in the profile {3}"
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_PROFILES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} type profiles"
 msgid_plural "Error in discriminator at {1}: no children, {0} type profiles"
 msgstr[0] ""
 msgstr[1] ""
 
 #: FHIRPATH_DISCRIMINATOR_MULTIPLE_TYPES
-msgid ""
+msgid "Error in discriminator at {1}: no children, {0} types"
 msgid_plural "Error in discriminator at {1}: no children, {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -1144,7 +1150,7 @@ msgid "Invalid use of ofType() in discriminator - Type has no code on {0}"
 msgstr "onjuist gebruik van ofType() in discriminator - Type heeft geen code op {0}"
 
 #: FHIRPATH_DISCRIMINATOR_RESOLVE_MULTIPLE_TYPES
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible types on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
@@ -1170,7 +1176,7 @@ msgid "Invalid use of ofType() in discriminator - no type on element {0}"
 msgstr "onjuist gebruik van ofType() in discriminator - geen type op element {0}"
 
 #: FHIRPATH_FOCUS
-msgid ""
+msgid "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
@@ -1183,16 +1189,16 @@ msgstr "Interne fout bij evalueren FHIRPath expressie: er zijn geen host service
 msgid "The type {0} is not valid"
 msgstr ""
 
-#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
-msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
-msgstr "Fout bij evalueren FHIRPath expressie: linker operandus van {0} heeft het verkeerde type {1}"
-
 #: FHIRPATH_LEFT_VALUE
-msgid ""
+msgid "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgid_plural "Error evaluating FHIRPath expression: left operand to {1} can only have 1 value, but has {0} values"
 msgstr[0] ""
 msgstr[1] ""
 
+#: FHIRPATH_LEFT_VALUE_WRONG_TYPE
+msgid "Error evaluating FHIRPath expression: left operand to {0} has the wrong type {1}"
+msgstr "Fout bij evalueren FHIRPath expressie: linker operandus van {0} heeft het verkeerde type {1}"
+
 #: FHIRPATH_LOCATION
 msgid "(at {0})"
 msgstr "(bij {0})"
@@ -1238,6 +1244,10 @@ msgstr "Fout bij evalueren FHIRPath expressie: Het expressietype {0} wordt niet
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on primitives"
 msgstr ""
 
+#: FHIRPATH_REDEFINE_VARIABLE
+msgid "The variable ''{0}'' cannot be redefined"
+msgstr ""
+
 #: FHIRPATH_REFERENCE_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered string, uri, canonical or Reference but found {1}"
 msgstr "Fout bij evalueren FHIRPath expressie: De functie {0} kan alleen worden gebruikt op een string, uri, canonical of Reference met volgorde maar gevonden {1}"
@@ -1247,21 +1257,21 @@ msgid "Problem with use of resolve() - profile {0} on {1} could not be resolved"
 msgstr "Probleem met gebruik van resolve() - profiel {0} op {1} is niet gevonden"
 
 #: FHIRPATH_RESOLVE_DISCRIMINATOR_NO_TARGET
-msgid ""
+msgid "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgid_plural "Invalid use of resolve() in discriminator - {0} possible target type profiles on {1} (can only be one)"
 msgstr[0] ""
 msgstr[1] ""
 
+#: FHIRPATH_RIGHT_VALUE
+msgid "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
+msgstr[0] ""
+msgstr[1] ""
+
 #: FHIRPATH_RIGHT_VALUE_WRONG_TYPE
 msgid "Error evaluating FHIRPath expression: right operand to {0} has the wrong type {1}"
 msgstr "Fout bij evalueren FHIRPath expressie: rechter operandus van {0} heeft het verkeerde type {1}"
 
-#: FHIRPATH_RIGHT_VALUE
-msgid ""
-msgid_plural "Error evaluating FHIRPath expression: right operand to {1} can only have 1 value, but has {0} values"
-msgstr[0] ""
-msgstr[1] ""
-
 #: FHIRPATH_STRING_ORD_ONLY
 msgid "Error evaluating FHIRPath expression: The function {0} can only be used on ordered collection of string, uri, code, id but found {1}"
 msgstr "Error evaluating FHIRPath expression: The function {0} can only be used on ordered collection of string, uri, code, id but found {1}"
@@ -1746,7 +1756,7 @@ msgid "Reference to withdrawn {2} {0} from {1}"
 msgstr ""
 
 #: MULTIPLE_LOGICAL_MODELS
-msgid ""
+msgid "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgid_plural "{0} Logical Models found in supplied profiles, so unable to parse logical model (can only be one, found {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -1768,7 +1778,7 @@ msgid "The element {0} is not marked as ''mustSupport'' in the profile {1}. Cons
 msgstr "Het element {0} is niet gemarkeerd als ''mustSupport'' in het profiel {1}. Overweeg het element niet gebruiken, of om het element als mustSupport te markeren in het profiel"
 
 #: NO_VALID_DISPLAY_FOUND
-msgid "No valid Display Names found for {1}#{2} in the language {4}"
+msgid "No valid Display Names found for {1}#{2} in the languages {4}"
 msgid_plural "No valid Display Names found for {1}#{2} in the languages {4}"
 msgstr[0] ""
 msgstr[1] ""
@@ -1822,7 +1832,7 @@ msgid "Node type {0} is not allowed"
 msgstr "Nodetype {0} is niet toegestaan"
 
 #: None_of_the_provided_codes_are_in_the_value_set
-msgid "The provided code {2} was not found in the value set ''{1}''"
+msgid "None of the provided codes [{2}] are in the value set ''{1}''"
 msgid_plural "None of the provided codes [{2}] are in the value set ''{1}''"
 msgstr[0] ""
 msgstr[1] ""
@@ -1896,7 +1906,7 @@ msgid "The element definition ``{0}`` in the profile ''{1}'' requires that a val
 msgstr ""
 
 #: PRIMITIVE_VALUE_ALTERNATIVES_MESSAGE
-msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, the extension ''{2}'' must be present"
+msgid "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgid_plural "The element definition ``{0}`` in the profile ''{1}'' requires that if a value is not present, one of the extensions ''{2}'' must be present"
 msgstr[0] ""
 msgstr[1] ""
@@ -1954,7 +1964,7 @@ msgid "Profile based discriminators must have a type with a profile ({0} in prof
 msgstr "Profiel-gebaseerde discriminators moeten een type hebben met een profiel ({0} in profiel {1})"
 
 #: Profile_based_discriminators_must_have_only_one_type__in_profile
-msgid ""
+msgid "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgid_plural "Profile based discriminators must have only one type ({1} in profile {2}) but found {0} types"
 msgstr[0] ""
 msgstr[1] ""
@@ -2138,7 +2148,7 @@ msgid "Only one response answer item with this linkId allowed"
 msgstr "Er is slechts een antwoorditem toegestaan bij dit linkId"
 
 #: Questionnaire_QR_Item_OnlyOneI
-msgid ""
+msgid "Only one response item with the linkId {1} allowed - found {0} items"
 msgid_plural "Only one response item with the linkId {1} allowed - found {0} items"
 msgstr[0] ""
 msgstr[1] ""
@@ -2160,7 +2170,7 @@ msgid "Cannot validate time answer option because no option list is provided"
 msgstr "Kan tijd-antwoord niet valideren omdat er geen optielijst is gespecificeerd"
 
 #: Questionnaire_QR_Item_WrongType
-msgid "Answer value must be of the type {1}"
+msgid "Answer value must be one of the {0} types {1}"
 msgid_plural "Answer value must be one of the {0} types {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2378,13 +2388,13 @@ msgid "Profile {0} is for type {1}, which is not a {4} (which is required becaus
 msgstr "Profiel {0} is voor type {1}, wat geen {4} is (welke wordt vereist om het {3} element type {2} heeft)"
 
 #: SD_ED_TYPE_PROFILE_WRONG_TYPE
-msgid "The type {0} is not in the list of allowed type {1} in the profile {2}"
+msgid "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgid_plural "The type {0} is not in the list of allowed types {1} in the profile {2}"
 msgstr[0] ""
 msgstr[1] ""
 
 #: SD_ED_TYPE_WRONG_TYPE
-msgid "The element has a type {0} which is different to the type {1} on the base profile {2}"
+msgid "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgid_plural "The element has a type {0} which is not in the types {1} on the base profile {2}"
 msgstr[0] ""
 msgstr[1] ""
@@ -2874,7 +2884,11 @@ msgid "Could not confirm that the codes provided are from the required value set
 msgstr "Kan niet bevestigen dat de gevonden codes bestaan in de verplichte waardelijst {0} omdat er geen terminologieservice is"
 
 #: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES
-msgid "The OID ''{0}'' matches multiple code systems ({1})"
+msgid "The OID ''{0}'' matches multiple resources ({1})"
+msgstr ""
+
+#: TERMINOLOGY_TX_OID_MULTIPLE_MATCHES_CHOSEN
+msgid "The OID ''{0}'' matches multiple resources ({2}); {1} was chosen as the most appropriate"
 msgstr ""
 
 #: TERMINOLOGY_TX_SYSTEM_HTTPS
@@ -2899,7 +2913,7 @@ msgid "The code system reference {0} is wrong - the code system reference cannot
 msgstr "De codesysteemverwijzing {0} is incorrect - de codesysteemverwijzing kan niet naar een HTML-pagina leiden. Mogelijk is dit de juiste verwijzing: {1}"
 
 #: TERMINOLOGY_TX_UNKNOWN_OID
-msgid "The OID ''{0}'' is not known, so the code can't be validated"
+msgid "The OID ''{0}'' is not known, so the code can''t be validated"
 msgstr ""
 
 #: TERMINOLOGY_TX_WARNING
@@ -3663,7 +3677,7 @@ msgid "The Unicode sequence has unterminated bi-di control characters (see CVE-2
 msgstr "!!De Unicode sequence heeft niet-beeindigde bidirectionele stuurtekens (zie CVE-2021-42574): {1}"
 
 #: UNICODE_XML_BAD_CHARS
-msgid "This content includes the character {1} (hex value). This character is illegal in the XML version of FHIR, and there is generally no valid use for such characters"
+msgid "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgid_plural "This content includes the characters {1} (hex values). These characters are illegal in the XML version of FHIR, and there is generally no valid use for such characters"
 msgstr[0] ""
 msgstr[1] ""
@@ -3810,9 +3824,9 @@ msgid "The System URI could not be determined for the code ''{0}'' in the ValueS
 msgstr "!!Kan system niet vinden - waardelijst heeft imports"
 
 #: Unable_to_resolve_system__value_set_has_include_with_filter
-#| Unable to resolve system - value set {0} include #{1} has a filter on system {2}
+#| The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}
-msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}"
+msgid "The System URI could not be determined for the code ''{0}'' in the ValueSet ''{1}'': include #{2} has a filter on system {3}: {4}"
-msgstr "!!Unable to resolve system - value set {0} include #{1} has a filter on system {2}"
+msgstr "!!!!Unable to resolve system - value set {0} include #{1} has a filter on system {2}"
 
 #: Unable_to_resolve_system__value_set_has_include_with_no_system
 msgid "Unable to resolve system - value set {0} include #{1} has no system"
@@ -4053,7 +4067,7 @@ msgid "The resource status ''{0}'' and the standards status ''{1}'' may not be c
 msgstr ""
 
 #: VALUESET_BAD_FILTER_OP
-msgid "The operation ''{0}'' is not allowed for property ''{1}''. Allowed ops: {2}"
+msgid "The operation ''{0}'' is not allowed for property ''{1}'' in system ''{3}''. Allowed ops: {2}"
 msgstr ""
 
 #: VALUESET_BAD_FILTER_VALUE_BOOLEAN
@@ -4092,6 +4106,10 @@ msgstr ""
 msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3})"
 msgstr ""
 
+#: VALUESET_BAD_FILTER_VALUE_VALID_CODE_CHANGE
+msgid "The value for a filter based on property ''{0}'' must be a valid code from the system ''{2}'', and ''{1}'' is not ({3}). Note that this is change from the past; terminology servers are expected to still continue to support this filter"
+msgstr ""
+
 #: VALUESET_BAD_FILTER_VALUE_VALID_REGEX
 msgid "The value for a filter based on property ''{0}'' should be a valid regex, not ''{1}'' (err = ''{2}'')"
 msgstr ""
@@ -4215,7 +4233,7 @@ msgid "Published value sets SHALL conform to the ShareableValueSet profile, whic
 msgstr "!!Het ShareableValueSet profiel zegt dat het {0} element verplicht is, maar het ontbreekt. Door HL7 gepubliceerde waardelijsten MOETEN zich houden aan het ShareableValueSet profiel"
 
 #: VALUESET_SUPPLEMENT_MISSING
-msgid "Required supplement not found: {1}"
+msgid "Required supplements not found: {1}"
 msgid_plural "Required supplements not found: {1}"
 msgstr[0] ""
 msgstr[1] ""
@@ -4246,7 +4264,7 @@ msgid "The property ''{0}'' is not known for the system ''{1}'', so may not be u
 msgstr ""
 
 #: VALUESET_UNKNOWN_FILTER_PROPERTY_NO_CS
-msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it's useful, the list of generally known properties for all systems is {2}"
+msgid "No definition can be found for the system {1}, and the property ''{0}'' is not a generally known property, so the property might not be valid, or understood by the terminology ecosystem. In case it''s useful, the list of generally known properties for all systems is {2}"
 msgstr ""
 
 #: Validation_BUNDLE_Message
@@ -4272,32 +4290,32 @@ msgid_plural "{3}: max allowed = {7}, but found {0} (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Validation_VAL_Profile_Minimum_SLICE
-msgid "Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice"
-msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
-msgstr[0] ""
-msgstr[1] ""
-
 #: Validation_VAL_Profile_Minimum
 msgid "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgid_plural "{3}: minimum required = {7}, but only found {0} (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
+#: Validation_VAL_Profile_Minimum_SLICE
+msgid "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgid_plural "Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})"
+msgstr[0] ""
+msgstr[1] ""
+
 #: Validation_VAL_Profile_MultipleMatches
-msgid "Found multiple matching profiles among {0} choice: {1}"
+msgid "Found multiple matching profiles among {0} choices: {1}"
 msgid_plural "Found multiple matching profiles among {0} choices: {1}"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Validation_VAL_Profile_NoCheckMax
-msgid "{3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
 
 #: Validation_VAL_Profile_NoCheckMin
-msgid "{3}: Found {0} match, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
+msgid "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgid_plural "{3}: Found {0} matches, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4397,7 +4415,7 @@ msgid "The URL is not valid because ''({1})'': {0}"
 msgstr "De URL is ongeldig vanwege ''({1})'' : {0}"
 
 #: XHTML_URL_INVALID_CHARS
-msgid "URL contains Invalid Character ({1})"
+msgid "URL contains {0} Invalid Characters ({1})"
 msgid_plural "URL contains {0} Invalid Characters ({1})"
 msgstr[0] ""
 msgstr[1] ""
@@ -4547,3 +4565,4 @@ msgstr "De XML encoding is onjuist (moet UTF-8 zijn)"
 #: xml_stated_encoding_invalid
 msgid "The XML encoding stated in the header is invalid (must be ''UTF-8'' if stated)"
 msgstr "De XML encoding in de header is onjuist (moet ''UTF-8'' zijn, indien gespecificeerd)"
+

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ObservationValidator.java

@@ -48,7 +48,7 @@ public class ObservationValidator extends BaseValidator {
         ok = checkObservationAgainstProfile(valContext,errors, element, stack, "http://hl7.org/fhir/StructureDefinition/resprate", "Respiratory Rate", "LOINC", codes, pct, mode) && ok;
       } else if (hasLoincCode(code, codes, "60978-4", "73795-7", "73799-9", "76476-1", "76477-9", "8867-4", "8889-8", "8890-6", "8891-4", "8892-2", "8893-0", "40443-4", "55425-3", "68999-2", "11328-2", "69000-8", "69000-8", "60978-4", "60978-4", "8890-6", "8886-4", "68999-2", "68999-2")) {
         ok = checkObservationAgainstProfile(valContext,errors, element, stack, "http://hl7.org/fhir/StructureDefinition/heartrate", "Heart rate", "LOINC", codes, pct, mode) && ok;
-      } else if (hasLoincCode(code, codes, "2708-6", "19224-5", "20564-1", "2709-4", "2710-2", "2711-0", "2713-6", "51733-4", "59408-5", "59417-6", "89276-0", "97549-0")) {
+      } else if (hasLoincCode(code, codes, "2708-6", "19224-5", "20564-1", "2709-4", "2710-2", "2713-6", "51733-4", "59408-5", "59417-6", "89276-0", "97549-0")) {
         ok = checkObservationAgainstProfile(valContext,errors, element, stack, "http://hl7.org/fhir/StructureDefinition/oxygensat", "Oxygen saturation", "LOINC", codes, pct, mode) && ok;
       } else if (hasLoincCode(code, codes, "8310-5", "60834-9", "60835-6", "60836-4", "60838-0", "60955-2", "61009-7", "75539-7", "75987-8", "76010-8", "76011-6", "76278-1", "8309-7", "8310-5", "8328-7", "8329-5", "8330-3", "8331-1", "8332-9", "8333-7", "8334-5", "91371-5", "98657-0", "98663-8")) {
         ok = checkObservationAgainstProfile(valContext,errors, element, stack, "http://hl7.org/fhir/StructureDefinition/bodytemp", "Body temperature", "LOINC", codes, pct, mode) && ok;